feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qml2puppet: Enhance qbs build

Browse Source 
Add the optional QtQuick3D dependency that was so far only in the qmake
project file. Also fix annoying moc warnings for builds without
QtQuick3D.

Change-Id: Ic0f4f3de5b4a5d715332166d7390ad027dd377ed
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-04-23 15:46:40 +02:00
parent e915cde44b
commit 69f7865c72
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/tools/qml2puppet/qml2puppet.qbs
View File

@@ -1,4 +1,4 @@
import qbs
import qbs.Utilities
import QtcFunctions
QtcTool {
@@ -15,7 +15,16 @@ QtcTool {
"widgets"
]
}
cpp.defines: base.filter(function(d) { return d != "QT_CREATOR"; })
Depends { name: "Qt.quick3d-private"; required: false }
property bool useQuick3d: Utilities.versionCompare(Qt.core.version, "5.15") >= 0
&& Qt["quick3d-private"].present
cpp.defines: {
var defines = base.filter(function(d) { return d != "QT_CREATOR"; });
if (useQuick3d)
defines.push("QUICK3D_MODULE");
return defines;
}
Properties {
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd")
cpp.dynamicLibraries: base.concat("rt")
@@ -204,25 +213,33 @@ QtcTool {
"instances/servernodeinstance.cpp",
"instances/servernodeinstance.h",
"editor3d/generalhelper.cpp",
"editor3d/generalhelper.h",
"editor3d/mousearea3d.cpp",
"editor3d/mousearea3d.h",
"editor3d/camerageometry.cpp",
"editor3d/camerageometry.h",
"editor3d/lightgeometry.cpp",
"editor3d/lightgeometry.h",
"editor3d/gridgeometry.cpp",
"editor3d/gridgeometry.h",
"editor3d/selectionboxgeometry.cpp",
"editor3d/selectionboxgeometry.h",
"editor3d/linegeometry.cpp",
"editor3d/linegeometry.h",
"editor3d/icongizmoimageprovider.cpp",
"editor3d/icongizmoimageprovider.h",
"iconrenderer/iconrenderer.cpp",
"iconrenderer/iconrenderer.h",
"qml2puppetmain.cpp",
]
Group {
name: "3d-only puppet2 headers"
files: [
"editor3d/camerageometry.h",
"editor3d/generalhelper.h",
"editor3d/gridgeometry.h",
"editor3d/lightgeometry.h",
"editor3d/linegeometry.h",
"editor3d/selectionboxgeometry.h",
"editor3d/mousearea3d.h",
]
fileTags: product.useQuick3d ? [] : ["unmocable"]
overrideTags: false
}
}
Group {