diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2021-08-10 19:28:06 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-08-20 07:03:24 +0000 |
| commit | c568ab89c5c0adc53857a342ab11dd7eec524d52 (patch) | |
| tree | 0e645ee820f55b9ca134956e1071e748e41b1358 | |
| parent | 142a34464fc69eb460c100be8efe062d5fdce1f6 (diff) | |
Tracing/QmlProfiler/PerfProfiler: Fix qt_add_qml_module call
This change fixes the failing configuration against a recent Qt (post
6.2-Beta2) build:
CMake Error at QTDIR/qtbase/lib/cmake/Qt6Qml/Qt6QmlMacros.cmake:196
(message):
PLUGIN_TARGET must also be provided when NO_CREATE_PLUGIN_TARGET is
used.
If you want to disable creating a plugin altogether, use the NO_PLUGIN
option instead.
Change-Id: If1dbfb09bda8e8cdd07cc575076dd6ccec1a4d39
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | coin/instructions/common_environment.yaml | 2 | ||||
| -rw-r--r-- | src/libs/tracing/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/perfprofiler/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/qmlprofiler/CMakeLists.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 1208997f8f..0fb670ae84 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -7,7 +7,7 @@ instructions: variableValue: "RelWithDebInfo" - type: EnvironmentVariable variableName: QTC_QT_BASE_URL - variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.2/6.2.0-beta2-released/" + variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.2/6.2.0-beta3-released/" - type: EnvironmentVariable variableName: QTC_QT_MODULES variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations" diff --git a/src/libs/tracing/CMakeLists.txt b/src/libs/tracing/CMakeLists.txt index 826e04426d..ce75e5f116 100644 --- a/src/libs/tracing/CMakeLists.txt +++ b/src/libs/tracing/CMakeLists.txt @@ -112,7 +112,7 @@ else() # < Qt 6.2 qt_add_qml_module(Tracing URI "QtCreator.Tracing" VERSION "1.0" - NO_CREATE_PLUGIN_TARGET + NO_PLUGIN QML_FILES ${TRACING_QML_FILES} RESOURCES diff --git a/src/plugins/perfprofiler/CMakeLists.txt b/src/plugins/perfprofiler/CMakeLists.txt index 2a3b3fbb3c..438ae554f1 100644 --- a/src/plugins/perfprofiler/CMakeLists.txt +++ b/src/plugins/perfprofiler/CMakeLists.txt @@ -68,7 +68,7 @@ else() # < Qt 6.2 qt_add_qml_module(PerfProfiler URI "QtCreator.PerfProfiler" VERSION "1.0" - NO_CREATE_PLUGIN_TARGET + NO_PLUGIN QML_FILES PerfProfilerFlameGraphView.qml SOURCES diff --git a/src/plugins/qmlprofiler/CMakeLists.txt b/src/plugins/qmlprofiler/CMakeLists.txt index e22bb1768f..847d92e695 100644 --- a/src/plugins/qmlprofiler/CMakeLists.txt +++ b/src/plugins/qmlprofiler/CMakeLists.txt @@ -114,7 +114,7 @@ else() # < Qt 6.2 qt_add_qml_module(QmlProfiler URI "QtCreator.QmlProfiler" VERSION "1.0" - NO_CREATE_PLUGIN_TARGET + NO_PLUGIN QML_FILES ${QMLPROFILER_QML_FILES} RESOURCES |