diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-15 15:33:13 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-15 13:57:41 +0000 |
| commit | 6f596ea5ee9b57995bef137fbf461acd4b6b03b0 (patch) | |
| tree | 2daa63400b21fc72959212e5b6d60d48dfe464ca /src/plugins/cpptools/stringtable.cpp | |
| parent | 242579099a3fd31499e03b945e866e7159f4a1fb (diff) | |
| download | qt-creator-6f596ea5ee9b57995bef137fbf461acd4b6b03b0.tar.gz | |
CppTools: Fix Qt6 build wrt internal QString changes
Task-number: QTCREATORBUG-24098
Change-Id: Ic1f72365a696993b3e81e9600b3b89d75d5e8bc4
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cpptools/stringtable.cpp')
| -rw-r--r-- | src/plugins/cpptools/stringtable.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/cpptools/stringtable.cpp b/src/plugins/cpptools/stringtable.cpp index d3a9f51a2a..e27fc5ceae 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<QString&>(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<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() |