diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-01 15:02:21 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-01 15:02:21 (GMT) |
| commit | e59d0d246453878c8412ec1ec6156ff612a8c47d (patch) | |
| tree | bef23739b037dfbd7e5d97caf1c5c26278d0746d | |
| parent | cab1428311067872b811679e72e0ad457d76a24f (diff) | |
| parent | 2d719ce634efa5e0abfb5d76eb516133753b5a62 (diff) | |
| download | Qt-e59d0d246453878c8412ec1ec6156ff612a8c47d.zip Qt-e59d0d246453878c8412ec1ec6156ff612a8c47d.tar.gz Qt-e59d0d246453878c8412ec1ec6156ff612a8c47d.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/tiff.pro | 3 |
2 files changed, 4 insertions, 3 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 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 |