diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-21 09:31:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-21 09:31:01 +0200 |
| commit | dbb62016052ad70e8e3dffb60a419504c9eb6dac (patch) | |
| tree | 7926ab117c9932be15b8886ba5230048da97bc07 /src/tools/qml2puppet | |
| parent | 526579b09d1be00ef2f0e371e0c57064777e6538 (diff) | |
| parent | cc6f35016ab6f7a1ce82a39582141ab8a35b7bce (diff) | |
Merge remote-tracking branch 'origin/4.14' into master
Change-Id: Id7ad82997873da828456a15c441620d93c6fc7e7
Diffstat (limited to 'src/tools/qml2puppet')
| -rw-r--r-- | src/tools/qml2puppet/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet.qbs | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt index 85809020d8c..1dbdd5b7fa3 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -138,6 +138,14 @@ extend_qtc_executable(qml2puppet ) extend_qtc_executable(qml2puppet + CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0 + + SOURCES_PREFIX "${SRCDIR}/qml2puppet/editor3d/qt5compat" + SOURCES + qquick3darealight.cpp qquick3darealight_p.h +) + +extend_qtc_executable(qml2puppet SOURCES_PREFIX "${SRCDIR}/qml2puppet/iconrenderer" SOURCES iconrenderer.cpp iconrenderer.h diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index 742c20406ec..63341b5dc28 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -19,6 +19,8 @@ QtcTool { property bool useQuick3d: Utilities.versionCompare(Qt.core.version, "5.15") >= 0 && Qt["quick3d-private"].present + property bool useQt5Compat: Utilities.versionCompare(Qt.core.version, "6.0") >= 0 + cpp.defines: { var defines = base.filter(function(d) { return d != "QT_CREATOR"; }); if (useQuick3d) @@ -258,6 +260,20 @@ QtcTool { fileTags: product.useQuick3d ? [] : ["unmocable"] overrideTags: false } + + Group { + name: "puppet2 Qt 5 compatibility sources" + condition: useQt5Compat + files: ["editor3d/qt5compat/qquick3darealight.cpp"] + } + + Group { + name: "puppet2 Qt 5 compatibility headers" + condition: useQt5Compat + files: ["editor3d/qt5compat/qquick3darealight_p.h"] + fileTags: product.useQuick3d ? [] : ["unmocable"] + overrideTags: false + } } Group { |