Fix qbs build

Amends b338405477.

Change-Id: I2b63dacba611b24fa9df45dd707484b1de1a3233
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2022-07-12 08:15:09 +02:00
parent 9306ad61d2
commit a74582a9d3
2 changed files with 2 additions and 12 deletions

View File

@@ -2,14 +2,14 @@ QtcPlugin {
name: "ImageViewer" name: "ImageViewer"
Depends { name: "Qt.svg"; required: false } 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: "Qt.widgets" }
Depends { name: "Utils" } Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Properties { Properties {
condition: !Qt.svg.present || (usesQt6 && !Qt.svgwidgets.present) condition: !Qt.svg.present || !Qt.svgwidgets.present
cpp.defines: base.concat("QT_NO_SVG") cpp.defines: base.concat("QT_NO_SVG")
} }

View File

@@ -175,16 +175,8 @@ QtcTool {
files: ["sharedmemory_qt.cpp"] files: ["sharedmemory_qt.cpp"]
} }
Group {
name: "puppet2 3D editor Qt5"
condition: !product.usesQt6
prefix: puppetDir + "/"
files: ["editor3d_qt5.qrc"]
}
Group { Group {
name: "puppet2 3D editor Qt6" name: "puppet2 3D editor Qt6"
condition: product.usesQt6
prefix: puppetDir + "/" prefix: puppetDir + "/"
files: ["editor3d_qt6.qrc"] files: ["editor3d_qt6.qrc"]
} }
@@ -296,13 +288,11 @@ QtcTool {
Group { Group {
name: "puppet2 Qt 5 compatibility sources" name: "puppet2 Qt 5 compatibility sources"
condition: product.usesQt6
files: ["editor3d/qt5compat/qquick3darealight.cpp"] files: ["editor3d/qt5compat/qquick3darealight.cpp"]
} }
Group { Group {
name: "puppet2 Qt 5 compatibility headers" name: "puppet2 Qt 5 compatibility headers"
condition: product.usesQt6
files: ["editor3d/qt5compat/qquick3darealight_p.h"] files: ["editor3d/qt5compat/qquick3darealight_p.h"]
fileTags: product.useQuick3d ? [] : ["unmocable"] fileTags: product.useQuick3d ? [] : ["unmocable"]
overrideTags: false overrideTags: false