diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 10:58:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 10:58:44 (GMT) |
| commit | a66bd0027d0708ddb11c5fbba8cc6411135c9110 (patch) | |
| tree | 39ad9821ade4cea4b746b78e4249cf5bc315ed41 /src | |
| parent | 236c3ad7bacf165069b834b62fede6b147cfaf03 (diff) | |
| parent | ae6be1c945030051ed069a4418e0453d7836daad (diff) | |
| download | Qt-a66bd0027d0708ddb11c5fbba8cc6411135c9110.zip Qt-a66bd0027d0708ddb11c5fbba8cc6411135c9110.tar.gz Qt-a66bd0027d0708ddb11c5fbba8cc6411135c9110.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix building with Sun CC 5.10: missing :: for the QWeakPointer declaration
compile fix for WinCE
Diffstat (limited to 'src')
| -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 |