diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-24 00:41:57 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-24 13:32:59 +0200 |
| commit | e2d360c04d8be90c06ec076bcc07bbbcdf385fc7 (patch) | |
| tree | a6bceade46463d167fa607dcabeea813dda5a938 /src | |
| parent | ffa249f9da9297e537b30081007a7ce92ae2ea16 (diff) | |
Wrap QObject usage in qsharedpointer_impl.h with ifndef QT_NO_QOBJECT
Otherwise, bootstrapped tools like qmake and moc won't compile, unless
QObject is forward-declared (which it isn't anymore).
Change-Id: If67ca1cd8fdb7b29628f9dc4b454595d26a715d0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 9d9698b8ca..f5a94fe00b 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -261,8 +261,10 @@ namespace QtSharedPointer { Q_DISABLE_COPY(ExternalRefCountWithContiguousData) }; +#ifndef QT_NO_QOBJECT Q_CORE_EXPORT QWeakPointer<QObject> weakPointerFromVariant_internal(const QVariant &variant); Q_CORE_EXPORT QSharedPointer<QObject> sharedPointerFromVariant_internal(const QVariant &variant); +#endif } // namespace QtSharedPointer template <class T> class QSharedPointer |