From 6c00b495a67b8fc37d3456eb33fe5a645bcb2887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Fri, 10 Mar 2023 14:49:52 +0100
Subject: [PATCH] Fix FTBFS with -qtnamespace

qtbase/src/corelib/kernel/qvariant.h(54): error C2888:
'const bool qIsRelocatable<qt::QVariant>': symbol cannot be defined within namespace 'qt'

Amends 0ca803a5d325f26f5e4e0fcab8b9c9a02f154336

Fixes: QTBUG-112016
Change-Id: I43b3f292fa85b6cda00f36da6c8aff65da4ed742
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit c0a732f984f407f7613805ff04b8a6d46c12f754)
---
 src/corelib/kernel/qvariant.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 50b8dc24fb6..990a2a08848 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -51,7 +51,9 @@ class QVariant;
 template<typename T>
 inline T qvariant_cast(const QVariant &);
 
-template<> constexpr inline bool QtPrivate::qIsRelocatable<QVariant> = true;
+namespace QtPrivate {
+template<> constexpr inline bool qIsRelocatable<QVariant> = true;
+}
 class Q_CORE_EXPORT QVariant
 {
     struct CborValueStandIn { qint64 n; void *c; int t; };