diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-28 15:30:48 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-29 09:19:07 +0200 |
| commit | 1f6ac40ff6aa3cbdaeb4da2e8adc43985b4ea651 (patch) | |
| tree | 0de2081ddb08cdbbdc404c909704e35bed20467d /src | |
| parent | a4084f6bf56081ba763b86596f15f15937e5e7da (diff) | |
QSharedPointer: Fix build error for cross-built tools
Guard friend declaration within QT_NO_QOBJECT.
Amends 28ce318fcbccb5a117ca4e55322ee1c1dd8d05d4.
Fixes: QTBUG-76056
Change-Id: I14fbe5457c16e8a366fecdc0a356b68b8609848b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@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 0d1dcb051b..55f0f17c52 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -678,9 +678,11 @@ public: #else template <class X> friend class QSharedPointer; template <class X> friend class QPointer; +# ifndef QT_NO_QOBJECT template<typename X> friend QWeakPointer<typename std::enable_if<QtPrivate::IsPointerToTypeDerivedFromQObject<X*>::Value, X>::type> qWeakPointerFromVariant(const QVariant &variant); +# endif template<typename X> friend QPointer<X> qPointerFromVariant(const QVariant &variant); |