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>
This commit is contained in:
parent
ffa249f9da
commit
e2d360c04d
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user