diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2012-01-18 17:21:04 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 18:40:45 +0100 |
| commit | 9e940ec8fc9217f255494006a94c4446e7b4ba45 (patch) | |
| tree | b3343acc1a3689d8573f9049007ff3ed94d1d9ef /src/corelib/tools/qscopedpointer.h | |
| parent | 253c801c56bbe9fb221ee20e5b4df2368c90b365 (diff) | |
Remove Q_CC_NOKIAX86.
This is no longer supported.
Change-Id: Ic393bc48c4c842514da69b6696cfb62b54360070
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
Diffstat (limited to 'src/corelib/tools/qscopedpointer.h')
| -rw-r--r-- | src/corelib/tools/qscopedpointer.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index 41e6dff90c..4d0809b39b 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -86,9 +86,7 @@ struct QScopedPointerPodDeleter template <typename T, typename Cleanup = QScopedPointerDeleter<T> > class QScopedPointer { -#ifndef Q_CC_NOKIAX86 typedef T *QScopedPointer:: *RestrictedBool; -#endif public: explicit inline QScopedPointer(T *p = 0) : d(p) { @@ -118,7 +116,7 @@ public: return !d; } -#if defined(Q_CC_NOKIAX86) || defined(Q_QDOC) +#if defined(Q_QDOC) inline operator bool() const { return isNull() ? 0 : &QScopedPointer::d; |