diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h index c3e737c9894..a7bc5153316 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h @@ -55,11 +55,7 @@ inline void load(Archive &archive, QList &list, const Parameters ¶meter //archive >> ref, T * const &>("item", list, &QList::append); archive >> ref("item", list, &QList::append); } else { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using ParameterType = typename QList::parameter_type; -#else - using ParameterType = T * const &; -#endif void (QList::*appendMethod)(ParameterType) = &QList::append; archive >> attr("item", list, appendMethod); } diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp index 15cd40b749d..084c52b027b 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp @@ -911,11 +911,7 @@ void PreviewDialog::setPixmap(const QPixmap &p, int zoom) m_label->adjustSize(); m_zoom = zoom; m_label->setZoom(m_zoom); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QSize size = m_label->pixmap().size() + QSize(54, 44); -#else - QSize size = m_label->pixmap()->size() + QSize(54, 44); -#endif if (size.width() < 180) size.setWidth(180); resize(size); diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp index 2b3acbc525b..248f1f92f30 100644 --- a/src/libs/qmljs/parser/qmljslexer.cpp +++ b/src/libs/qmljs/parser/qmljslexer.cpp @@ -14,11 +14,7 @@ #include QT_BEGIN_NAMESPACE -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -Q_CORE_EXPORT double qstrntod(const char *s00, int len, char const **se, bool *ok); -#else Q_CORE_EXPORT double qstrntod(const char *s00, qsizetype len, char const **se, bool *ok); -#endif QT_END_NAMESPACE using namespace QmlJS; diff --git a/src/libs/tracing/timelineitemsrenderpass.cpp b/src/libs/tracing/timelineitemsrenderpass.cpp index 81d4a7dbecc..ad142f628d5 100644 --- a/src/libs/tracing/timelineitemsrenderpass.cpp +++ b/src/libs/tracing/timelineitemsrenderpass.cpp @@ -466,7 +466,7 @@ TimelineItemsMaterial::TimelineItemsMaterial() : m_selectedItem(-1) setFlag(QSGMaterial::Blending, false); #if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) setFlag(QSGMaterial::NoBatching, true); -#elif QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#else setFlag(QSGMaterial::CustomCompileStep, true); #endif // >= Qt 6.3/6.0 } diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp index 644cf91ae2e..7e40120a03f 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp @@ -33,9 +33,6 @@ GradientPresetCustomListModel::GradientPresetCustomListModel(QObject *parent) : GradientPresetListModel(parent) , m_filename(getFilename()) { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - qRegisterMetaTypeStreamOperators("GradientPresetItem"); -#endif readPresets(); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp index 979614750b0..90496de9963 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp @@ -56,14 +56,10 @@ void Quick2PropertyEditorView::registerQmlTypes() const QString resourcePath = PropertyEditorQmlBackend::propertyEditorResourcesPath(); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QUrl regExpUrl = QUrl::fromLocalFile(resourcePath + "/RegExpValidator.qml"); qmlRegisterType(regExpUrl, "HelperWidgets", 2, 0, "RegExpValidator"); const QString qtPrefix = "/Qt6"; -#else - const QString qtPrefix = "/Qt5"; -#endif qmlRegisterType(QUrl::fromLocalFile(resourcePath + qtPrefix + "HelperWindow.qml"), "HelperWidgets", 2, diff --git a/src/plugins/qmldesigner/components/timelineeditor/easingcurve.cpp b/src/plugins/qmldesigner/components/timelineeditor/easingcurve.cpp index 8221164df54..55c1998fa91 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/easingcurve.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/easingcurve.cpp @@ -45,10 +45,6 @@ void EasingCurve::registerStreamOperators() { qRegisterMetaType("QmlDesigner::EasingCurve"); qRegisterMetaType("QmlDesigner::NamedEasingCurve"); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - qRegisterMetaTypeStreamOperators("QmlDesigner::EasingCurve"); - qRegisterMetaTypeStreamOperators("QmlDesigner::NamedEasingCurve"); -#endif } int EasingCurve::count() const diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp b/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp index bda76377cf8..efd8bf1ad08 100644 --- a/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp +++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachefontcollector.cpp @@ -49,11 +49,7 @@ static int resolveFont(const QString &fontFile, QFont &outFont) outFont.setFamily(fontFamily); outFont.setStyle(rawFont.style()); outFont.setStyleName(rawFont.styleName()); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) outFont.setWeight(QFont::Weight(rawFont.weight())); -#else - outFont.setWeight(rawFont.weight()); -#endif } } } diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 37e8e47197b..4b439114305 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -471,12 +471,7 @@ QProcessEnvironment PuppetCreator::processEnvironment() const environment.set("QML_PUPPET_MODE", "true"); environment.set("QML_DISABLE_DISK_CACHE", "true"); environment.set("QMLPUPPET_RENDER_EFFECTS", "true"); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - if (!environment.hasKey("QT_SCREEN_SCALE_FACTORS") && !environment.hasKey("QT_SCALE_FACTOR") - && QApplication::testAttribute(Qt::AA_EnableHighDpiScaling)) -#else if (!environment.hasKey("QT_SCREEN_SCALE_FACTORS") && !environment.hasKey("QT_SCALE_FACTOR")) -#endif environment.set("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); #ifndef QMLDESIGNER_TEST diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp index c5fd6b1cdab..6a36c798295 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp @@ -76,11 +76,7 @@ bool CMakeGeneratorDialogTreeModel::setData(const QModelIndex &index, const QVar const QList CMakeGeneratorDialogTreeModel::items() const { -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QList standardItems = findItems("*", Qt::MatchWildcard | Qt::MatchRecursive); -#else QList standardItems = findItems(".*", Qt::MatchRegularExpression | Qt::MatchRecursive); -#endif QList checkableItems; for (QStandardItem *item : standardItems) checkableItems.append(static_cast(item));