Skip to content

Commit

Permalink
Fix FTBFS with -qtnamespace
Browse files Browse the repository at this point in the history
qtbase/src/corelib/kernel/qvariant.h(54): error C2888:
'const bool qIsRelocatable<qt::QVariant>': symbol cannot be defined within namespace 'qt'

Amends 0ca803a

Pick-to: 6.5 6.5.0
Change-Id: I43b3f292fa85b6cda00f36da6c8aff65da4ed742
Reviewed-by: Volker Hilsheimer <[email protected]>
Reviewed-by: Marc Mutz <[email protected]>
  • Loading branch information
Morten242 committed Mar 10, 2023
1 parent 217f2ab commit c0a732f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/corelib/kernel/qvariant.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand Down

0 comments on commit c0a732f

Please sign in to comment.