From 1f6ac40ff6aa3cbdaeb4da2e8adc43985b4ea651 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 28 May 2019 15:30:48 +0200 Subject: [PATCH] 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 Reviewed-by: Giuseppe D'Angelo --- src/corelib/tools/qsharedpointer_impl.h | 2 ++ 1 file changed, 2 insertions(+) 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 friend class QSharedPointer; template friend class QPointer; +# ifndef QT_NO_QOBJECT template friend QWeakPointer::Value, X>::type> qWeakPointerFromVariant(const QVariant &variant); +# endif template friend QPointer qPointerFromVariant(const QVariant &variant);