diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-01 09:42:04 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-01 09:43:30 (GMT) |
| commit | ae6be1c945030051ed069a4418e0453d7836daad (patch) | |
| tree | 3552da0f4e1a793a873f8d914fe3e505e9b7002a /src/corelib/tools | |
| parent | 57686d28fed85c9f8fbb340cd05f3fb6322332f7 (diff) | |
| download | Qt-ae6be1c945030051ed069a4418e0453d7836daad.zip Qt-ae6be1c945030051ed069a4418e0453d7836daad.tar.gz Qt-ae6be1c945030051ed069a4418e0453d7836daad.tar.bz2 | |
Fix building with Sun CC 5.10: missing :: for the QWeakPointer declaration
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 4 |
1 files 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 |