diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs index 017094fd903..d9562c27c56 100644 --- a/src/plugins/imageviewer/imageviewer.qbs +++ b/src/plugins/imageviewer/imageviewer.qbs @@ -2,14 +2,14 @@ QtcPlugin { name: "ImageViewer" Depends { name: "Qt.svg"; required: false } - Depends { name: "Qt.svgwidgets"; condition: usesQt6; required: false } + Depends { name: "Qt.svgwidgets"; required: false } Depends { name: "Qt.widgets" } Depends { name: "Utils" } Depends { name: "Core" } Properties { - condition: !Qt.svg.present || (usesQt6 && !Qt.svgwidgets.present) + condition: !Qt.svg.present || !Qt.svgwidgets.present cpp.defines: base.concat("QT_NO_SVG") } diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index 0031fe34c9d..b001e790f20 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -175,16 +175,8 @@ QtcTool { files: ["sharedmemory_qt.cpp"] } - Group { - name: "puppet2 3D editor Qt5" - condition: !product.usesQt6 - prefix: puppetDir + "/" - files: ["editor3d_qt5.qrc"] - } - Group { name: "puppet2 3D editor Qt6" - condition: product.usesQt6 prefix: puppetDir + "/" files: ["editor3d_qt6.qrc"] } @@ -296,13 +288,11 @@ QtcTool { Group { name: "puppet2 Qt 5 compatibility sources" - condition: product.usesQt6 files: ["editor3d/qt5compat/qquick3darealight.cpp"] } Group { name: "puppet2 Qt 5 compatibility headers" - condition: product.usesQt6 files: ["editor3d/qt5compat/qquick3darealight_p.h"] fileTags: product.useQuick3d ? [] : ["unmocable"] overrideTags: false