From e2d360c04d8be90c06ec076bcc07bbbcdf385fc7 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 24 Jun 2012 00:41:57 +0200
Subject: 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>
---
 src/corelib/tools/qsharedpointer_impl.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

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
-- 
cgit v1.2.3