AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap QObject usage in qsharedpointer_impl.h with ifndef QT_NO_QOBJECT

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2012-06-24 00:41:57 +02:00 committed by Qt by Nokia
parent ffa249f9da
commit e2d360c04d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qsharedpointer_impl.h
View File

@ -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