diff --git a/src/libs/languageserverprotocol/jsonobject.h b/src/libs/languageserverprotocol/jsonobject.h index 178e74e5ad7..fd90453da1a 100644 --- a/src/libs/languageserverprotocol/jsonobject.h +++ b/src/libs/languageserverprotocol/jsonobject.h @@ -10,26 +10,11 @@ #include #include -#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) #include -#else -#include -#endif namespace LanguageServerProtocol { -#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) using Key = QLatin1StringView; -#else -class Key : public QLatin1String -{ -public: - using QLatin1String::QLatin1String; - constexpr inline explicit Key(const char *s) noexcept - : QLatin1String(s, std::char_traits::length(s)) - {} -}; -#endif class LANGUAGESERVERPROTOCOL_EXPORT JsonObject { diff --git a/src/libs/tracing/timelineitemsrenderpass.cpp b/src/libs/tracing/timelineitemsrenderpass.cpp index b93bd83b427..5b50a153e6c 100644 --- a/src/libs/tracing/timelineitemsrenderpass.cpp +++ b/src/libs/tracing/timelineitemsrenderpass.cpp @@ -464,11 +464,7 @@ bool TimelineItemsMaterialShader::updateUniformData(RenderState &state, TimelineItemsMaterial::TimelineItemsMaterial() : m_selectedItem(-1) { setFlag(QSGMaterial::Blending, false); -#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) setFlag(QSGMaterial::NoBatching, true); -#else - setFlag(QSGMaterial::CustomCompileStep, true); -#endif // >= Qt 6.3/6.0 } QVector2D TimelineItemsMaterial::scale() const diff --git a/src/libs/tracing/timelinenotesrenderpass.cpp b/src/libs/tracing/timelinenotesrenderpass.cpp index 0f3fa00de32..5a3939b4f32 100644 --- a/src/libs/tracing/timelinenotesrenderpass.cpp +++ b/src/libs/tracing/timelinenotesrenderpass.cpp @@ -152,11 +152,7 @@ TimelineNotesRenderPassState::TimelineNotesRenderPassState(int numExpandedRows) m_nullGeometry(NotesGeometry::point2DWithDistanceFromTop(), 0) { m_material.setFlag(QSGMaterial::Blending, true); -#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) m_material.setFlag(QSGMaterial::NoBatching, true); -#else - m_material.setFlag(QSGMaterial::CustomCompileStep, true); -#endif // >= Qt 6.3 m_expandedRows.reserve(numExpandedRows); for (int i = 0; i < numExpandedRows; ++i) m_expandedRows << createNode(); diff --git a/src/libs/utils/async.cpp b/src/libs/utils/async.cpp index 33487db73be..b67e83fc721 100644 --- a/src/libs/utils/async.cpp +++ b/src/libs/utils/async.cpp @@ -17,16 +17,6 @@ public: } }; -#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0) -Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_idle, (QThread::IdlePriority)); -Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_lowest, (QThread::LowestPriority)); -Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_low, (QThread::LowPriority)); -Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_normal, (QThread::NormalPriority)); -Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_high, (QThread::HighPriority)); -Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_highest, (QThread::HighestPriority)); -Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_timeCritical, (QThread::TimeCriticalPriority)); -Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_inherit, (QThread::InheritPriority)); -#else Q_GLOBAL_STATIC(AsyncThreadPool, s_idle, QThread::IdlePriority); Q_GLOBAL_STATIC(AsyncThreadPool, s_lowest, QThread::LowestPriority); Q_GLOBAL_STATIC(AsyncThreadPool, s_low, QThread::LowPriority); @@ -35,7 +25,6 @@ Q_GLOBAL_STATIC(AsyncThreadPool, s_high, QThread::HighPriority); Q_GLOBAL_STATIC(AsyncThreadPool, s_highest, QThread::HighestPriority); Q_GLOBAL_STATIC(AsyncThreadPool, s_timeCritical, QThread::TimeCriticalPriority); Q_GLOBAL_STATIC(AsyncThreadPool, s_inherit, QThread::InheritPriority); -#endif QThreadPool *asyncThreadPool(QThread::Priority priority) { diff --git a/src/libs/utils/fsengine/fsengine_impl.cpp b/src/libs/utils/fsengine/fsengine_impl.cpp index ade8236d5e1..05147709d47 100644 --- a/src/libs/utils/fsengine/fsengine_impl.cpp +++ b/src/libs/utils/fsengine/fsengine_impl.cpp @@ -35,11 +35,7 @@ FSEngineImpl::~FSEngineImpl() delete m_tempStorage; } -#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) bool FSEngineImpl::open(QIODeviceBase::OpenMode openMode, std::optional) -#else -bool FSEngineImpl::open(QIODevice::OpenMode openMode) -#endif { const FilePathInfoCache::CachedData data = g_filePathInfoCache.cached(m_filePath, createCacheData); @@ -162,12 +158,8 @@ bool FSEngineImpl::link(const QString &newName) return false; } -#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) bool FSEngineImpl::mkdir(const QString &dirName, bool createParentDirectories, std::optional) const -#else -bool FSEngineImpl::mkdir(const QString &dirName, bool createParentDirectories) const -#endif { Q_UNUSED(createParentDirectories) return FilePath::fromString(dirName).createDir(); diff --git a/src/libs/utils/fsengine/fsengine_impl.h b/src/libs/utils/fsengine/fsengine_impl.h index 17481c1a6ae..6fcba8ac523 100644 --- a/src/libs/utils/fsengine/fsengine_impl.h +++ b/src/libs/utils/fsengine/fsengine_impl.h @@ -19,15 +19,10 @@ public: ~FSEngineImpl(); public: -#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) bool open(QIODeviceBase::OpenMode openMode, std::optional permissions = std::nullopt) override; bool mkdir(const QString &dirName, bool createParentDirectories, std::optional permissions = std::nullopt) const override; -#else - bool open(QIODevice::OpenMode openMode) override; - bool mkdir(const QString &dirName, bool createParentDirectories) const override; -#endif bool close() override; bool flush() override; bool syncToDisk() override; diff --git a/src/libs/utils/smallstring.h b/src/libs/utils/smallstring.h index c424e9e1ab2..0b2f0b629f1 100644 --- a/src/libs/utils/smallstring.h +++ b/src/libs/utils/smallstring.h @@ -200,12 +200,10 @@ public: operator SmallStringView() const noexcept { return SmallStringView(data(), size()); } - #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) explicit operator QLatin1StringView() const noexcept { return QLatin1StringView(data(), Utils::ssize(*this)); } -#endif operator QUtf8StringView() const noexcept { diff --git a/src/libs/utils/smallstringview.h b/src/libs/utils/smallstringview.h index 5a272178196..28f8b781501 100644 --- a/src/libs/utils/smallstringview.h +++ b/src/libs/utils/smallstringview.h @@ -79,12 +79,10 @@ public: explicit operator QByteArray() const { return QByteArray(data(), int(size())); } -#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) explicit operator QLatin1StringView() const noexcept { return QLatin1StringView(data(), Utils::ssize(*this)); } -#endif operator QUtf8StringView() const noexcept { diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 4aa3c6464d5..20df27bea5b 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -190,14 +190,6 @@ QRect ManhattanStyle::subControlRect( SubControl subControl, const QWidget *widget) const { -#if QT_VERSION < QT_VERSION_CHECK(6, 2, 5) - // Workaround for QTBUG-101581, can be removed when building with Qt 6.2.5 or higher - if (control == CC_ScrollBar) { - const auto scrollbar = qstyleoption_cast(option); - if (scrollbar && qint64(scrollbar->maximum) - scrollbar->minimum > INT_MAX) - return QRect(); // breaks the scrollbar, but avoids the crash - } -#endif return QProxyStyle::subControlRect(control, option, subControl, widget); } diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp index f35e9f2ed26..56296143cff 100644 --- a/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp +++ b/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp @@ -44,14 +44,7 @@ public: inline static bool isValidColorName(const QString &colorName) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) return QColor::isValidColorName(colorName); -#else - constexpr QStringView colorPattern( - u"(?^(?:#(?:(?:[0-9a-fA-F]{2}){3,4}|(?:[0-9a-fA-F]){3,4}))$)"); - static const QRegularExpression colorRegex(colorPattern.toString()); - return colorRegex.match(colorName).hasMatch(); -#endif // >= Qt 6.4 } /** diff --git a/src/plugins/qmldesigner/components/componentcore/designericons.cpp b/src/plugins/qmldesigner/components/componentcore/designericons.cpp index 31e7b45fcdb..13f72764e8a 100644 --- a/src/plugins/qmldesigner/components/componentcore/designericons.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designericons.cpp @@ -223,16 +223,8 @@ struct JsonMap> { QJsonObject output; - #if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)) for (const auto &[key, val] : map.asKeyValueRange()) output[DesignerIconEnums::toString(key)] = JsonMap::json(val); - #else - const auto mapKeys = map.keys(); - for (const Key &key : mapKeys) { - const Value &val = map.value(key); - output[DesignerIconEnums::toString(key)] = JsonMap::json(val); - } - #endif return output; } @@ -397,15 +389,9 @@ void DesignerIcons::loadIconSettings(const QString &fileName) QJsonObject areaPackObject = areaPack.toObject(); singleAreaMap = JsonMap::value(areaPackObject, {}); -#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)) for (const auto &mapItem : singleAreaMap.asKeyValueRange()) { const IconId &id = mapItem.first; const AreaMap &areaMap = mapItem.second; -#else - const auto mapKeys = singleAreaMap.keys(); - for (const IconId &id : mapKeys) { - const AreaMap &areaMap = singleAreaMap.value(id); -#endif if (d->icons.contains(id)) { AreaMap &oldAreaMap = d->icons[id]; for (const auto &areaMapItem : areaMap.asKeyValueRange()) diff --git a/src/plugins/qmldesignerbase/studio/studiostyle.cpp b/src/plugins/qmldesignerbase/studio/studiostyle.cpp index d1891ca88db..6924e40f7cc 100644 --- a/src/plugins/qmldesignerbase/studio/studiostyle.cpp +++ b/src/plugins/qmldesignerbase/studio/studiostyle.cpp @@ -973,15 +973,6 @@ QRect StudioStyle::subControlRect( SubControl subControl, const QWidget *widget) const { -#if QT_VERSION < QT_VERSION_CHECK(6, 2, 5) - // Workaround for QTBUG-101581, can be removed when building with Qt 6.2.5 or higher - if (control == CC_ScrollBar) { - const auto scrollbar = qstyleoption_cast(option); - if (scrollbar && qint64(scrollbar->maximum) - scrollbar->minimum > INT_MAX) - return QRect(); // breaks the scrollbar, but avoids the crash - } -#endif - switch (control) { case CC_Slider: { if (const auto slider = qstyleoption_cast(option)) { diff --git a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp index 406ece2860d..0db02375ae3 100644 --- a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp @@ -309,11 +309,7 @@ bool BindingLoopMaterialShader::updateUniformData(RenderState &state, QSGMateria BindingLoopMaterial::BindingLoopMaterial() { setFlag(QSGMaterial::Blending, false); -#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) setFlag(QSGMaterial::NoBatching, true); -#else - setFlag(QSGMaterial::CustomCompileStep, true); -#endif // >= Qt 6.3 } QSGMaterialType *BindingLoopMaterial::type() const diff --git a/src/tools/iostool/relayserver.cpp b/src/tools/iostool/relayserver.cpp index 571a338b26f..0ea1be33ce9 100644 --- a/src/tools/iostool/relayserver.cpp +++ b/src/tools/iostool/relayserver.cpp @@ -33,11 +33,7 @@ void Relayer::setClientSocket(QTcpSocket *clientSocket) QTC_CHECK(!m_clientSocket); m_clientSocket = clientSocket; if (m_clientSocket) { -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - const auto errorOccurred = QOverload::of(&QAbstractSocket::error); -#else const auto errorOccurred = &QAbstractSocket::errorOccurred; -#endif connect(m_clientSocket, errorOccurred, this, &Relayer::handleClientHasError); connect(m_clientSocket, &QAbstractSocket::disconnected, this, [this](){server()->removeRelayConnection(this);}); diff --git a/tests/manual/subdirfilecontainer/tst_subdirfilecontainer.cpp b/tests/manual/subdirfilecontainer/tst_subdirfilecontainer.cpp index 89993b6a2b6..ca4925a9439 100644 --- a/tests/manual/subdirfilecontainer/tst_subdirfilecontainer.cpp +++ b/tests/manual/subdirfilecontainer/tst_subdirfilecontainer.cpp @@ -247,12 +247,7 @@ private slots: QDirIterator it(m_tempDir->path(), s_filters, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); while (it.hasNext()) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) const QFileInfo fi = it.nextFileInfo(); -#else - it.next(); - const QFileInfo fi = it.fileInfo(); -#endif if (fi.isDir()) { ++dirsCount; } else {