From c05c1f09a99c836cbaec655d7b49a09d0a2395df Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 25 Jul 2022 09:39:31 +0200 Subject: [PATCH] Drop Qt5: StringTable: Remove code below Qt 6.0.0 Change-Id: I28476865bcaa9ab2fc4e5ecd1ab80a10e4734f1b Reviewed-by: Christian Stenger Reviewed-by: --- src/plugins/cppeditor/stringtable.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/plugins/cppeditor/stringtable.cpp b/src/plugins/cppeditor/stringtable.cpp index 4bc2475b6a0..f5adc41210e 100644 --- a/src/plugins/cppeditor/stringtable.cpp +++ b/src/plugins/cppeditor/stringtable.cpp @@ -96,12 +96,6 @@ QString StringTablePrivate::insert(const QString &string) if (string.isEmpty()) return string; -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#ifndef QT_NO_UNSHARABLE_CONTAINERS - QTC_ASSERT(const_cast(string).data_ptr()->ref.isSharable(), return string); -#endif -#endif - QMutexLocker locker(&m_lock); // From this point of time any possible new call to startGC() will be held until // we finish this function. So we are sure that after canceling the running GC() method now, @@ -138,13 +132,8 @@ StringTable::~StringTable() static inline bool isQStringInUse(const QString &string) { -#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(QFutureInterface &futureInterface)