forked from qt-creator/qt-creator
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>
This commit is contained in:
committed by
Eike Ziller
parent
142a34464f
commit
c568ab89c5
@@ -7,7 +7,7 @@ instructions:
|
|||||||
variableValue: "RelWithDebInfo"
|
variableValue: "RelWithDebInfo"
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: QTC_QT_BASE_URL
|
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
|
- type: EnvironmentVariable
|
||||||
variableName: QTC_QT_MODULES
|
variableName: QTC_QT_MODULES
|
||||||
variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations"
|
variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations"
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ else() # < Qt 6.2
|
|||||||
qt_add_qml_module(Tracing
|
qt_add_qml_module(Tracing
|
||||||
URI "QtCreator.Tracing"
|
URI "QtCreator.Tracing"
|
||||||
VERSION "1.0"
|
VERSION "1.0"
|
||||||
NO_CREATE_PLUGIN_TARGET
|
NO_PLUGIN
|
||||||
QML_FILES
|
QML_FILES
|
||||||
${TRACING_QML_FILES}
|
${TRACING_QML_FILES}
|
||||||
RESOURCES
|
RESOURCES
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ else() # < Qt 6.2
|
|||||||
qt_add_qml_module(PerfProfiler
|
qt_add_qml_module(PerfProfiler
|
||||||
URI "QtCreator.PerfProfiler"
|
URI "QtCreator.PerfProfiler"
|
||||||
VERSION "1.0"
|
VERSION "1.0"
|
||||||
NO_CREATE_PLUGIN_TARGET
|
NO_PLUGIN
|
||||||
QML_FILES
|
QML_FILES
|
||||||
PerfProfilerFlameGraphView.qml
|
PerfProfilerFlameGraphView.qml
|
||||||
SOURCES
|
SOURCES
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ else() # < Qt 6.2
|
|||||||
qt_add_qml_module(QmlProfiler
|
qt_add_qml_module(QmlProfiler
|
||||||
URI "QtCreator.QmlProfiler"
|
URI "QtCreator.QmlProfiler"
|
||||||
VERSION "1.0"
|
VERSION "1.0"
|
||||||
NO_CREATE_PLUGIN_TARGET
|
NO_PLUGIN
|
||||||
QML_FILES
|
QML_FILES
|
||||||
${QMLPROFILER_QML_FILES}
|
${QMLPROFILER_QML_FILES}
|
||||||
RESOURCES
|
RESOURCES
|
||||||
|
|||||||
Reference in New Issue
Block a user