From 6f596ea5ee9b57995bef137fbf461acd4b6b03b0 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 15 Sep 2020 15:33:13 +0200 Subject: [PATCH] CppTools: Fix Qt6 build wrt internal QString changes Task-number: QTCREATORBUG-24098 Change-Id: Ic1f72365a696993b3e81e9600b3b89d75d5e8bc4 Reviewed-by: hjk --- src/plugins/cpptools/stringtable.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/cpptools/stringtable.cpp b/src/plugins/cpptools/stringtable.cpp index d3a9f51a2af..e27fc5ceaef 100644 --- a/src/plugins/cpptools/stringtable.cpp +++ b/src/plugins/cpptools/stringtable.cpp @@ -124,8 +124,13 @@ StringTable::~StringTable() static inline bool isQStringInUse(const QString &string) { - QArrayData *data_ptr = const_cast(string).data_ptr(); - return data_ptr->ref.isShared() || data_ptr->ref.isStatic(); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + auto data_ptr = const_cast(string).data_ptr(); + return data_ptr->ref.isShared() || data_ptr->ref.isStatic() /* QStringLiteral ? */; +#else + auto data_ptr = const_cast(string).data_ptr(); + return data_ptr->isShared() || !data_ptr->isMutable() /* QStringLiteral ? */; +#endif } void StringTablePrivate::GC()