feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppTools: Fix Qt6 build wrt internal QString changes

Browse Source 
Task-number: QTCREATORBUG-24098

Change-Id: Ic1f72365a696993b3e81e9600b3b89d75d5e8bc4
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-09-15 15:33:13 +02:00
parent 242579099a
commit 6f596ea5ee
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cpptools/stringtable.cpp
View File

@@ -124,8 +124,13 @@ StringTable::~StringTable()
static inline bool isQStringInUse(const QString &string) static inline bool isQStringInUse(const QString &string)
{ {
QArrayData *data_ptr = const_cast<QString&>(string).data_ptr(); #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
return data_ptr->ref.isShared() || data_ptr->ref.isStatic(); auto data_ptr = const_cast<QString&>(string).data_ptr();
return data_ptr->ref.isShared() || data_ptr->ref.isStatic() /* QStringLiteral ? */;
#else
auto data_ptr = const_cast<QString&>(string).data_ptr();
return data_ptr->isShared() || !data_ptr->isMutable() /* QStringLiteral ? */;
#endif
} }
void StringTablePrivate::GC() void StringTablePrivate::GC()