1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FTBFS with -qtnamespace

Browse Source 
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)
This commit is contained in:
Mårten Nordheim 2023-03-10 14:49:52 +01:00 committed by Marc Mutz
parent dbf4d319f0
commit 6c00b495a6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qvariant.h
View File

@ -51,7 +51,9 @@ class QVariant;
template<typename T> template<typename T>
inline T qvariant_cast(const QVariant &); 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 class Q_CORE_EXPORT QVariant
{ {
struct CborValueStandIn { qint64 n; void *c; int t; }; struct CborValueStandIn { qint64 n; void *c; int t; };