From 57686d28fed85c9f8fbb340cd05f3fb6322332f7 Mon Sep 17 00:00:00 2001
From: Maurice Kalinowski <maurice.kalinowski@nokia.com>
Date: Mon, 1 Mar 2010 10:18:09 +0100
Subject: compile fix for WinCE

need to add the win32 file to get copy and friends included

Reviewed-by: Simon Hausmann
---
 src/plugins/imageformats/tiff/tiff.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index 514fd69..85f618f 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -55,7 +55,8 @@ contains(QT_CONFIG, system-tiff) {
             }
             wince*: {
                SOURCES += ../../../corelib/kernel/qfunctions_wince.cpp \
-                          ../../../3rdparty/libtiff/libtiff/tif_wince.c
+                          ../../../3rdparty/libtiff/libtiff/tif_wince.c \
+			  ../../../3rdparty/libtiff/libtiff/tif_win32.c
             }
             symbian*: {
                SOURCES += ../../../3rdparty/libtiff/port/lfind.c
-- 
cgit v0.12


From ae6be1c945030051ed069a4418e0453d7836daad Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Mon, 1 Mar 2010 10:42:04 +0100
Subject: Fix building with Sun CC 5.10: missing :: for the QWeakPointer
 declaration

---
 src/corelib/tools/qsharedpointer_impl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index bfc65bc..550ff58 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -158,7 +158,7 @@ namespace QtSharedPointer {
 #if defined(Q_NO_TEMPLATE_FRIENDS)
     public:
 #else
-        template <class X> friend class QWeakPointer;
+        template <class X> friend class QT_PREPEND_NAMESPACE(QWeakPointer);
 #endif
 
         Type *value;
@@ -402,7 +402,7 @@ namespace QtSharedPointer {
     public:
 #else
         template <class X> friend class ExternalRefCount;
-        template <class X> friend class QWeakPointer;
+        template <class X> friend class QT_PREPEND_NAMESPACE(QWeakPointer);
         template <class X, class Y> friend QSharedPointer<X> copyAndSetPointer(X * ptr, const QSharedPointer<Y> &src);
 #endif
 
-- 
cgit v0.12