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

QmlProfiler/PerfProfiler: Restore support for Qt >= 6.2

Browse Source 
First (try to) add the target as Qt Creator plugin, *then* check whether
it exists.

Amends: 5aff1419fa

Change-Id: Ia7c318c0ffb7bbaa21159ddf9de88b80ad0033cb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2021-07-16 11:10:34 +02:00
parent ec8f0ff703
commit 5c37fb1f65
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/perfprofiler/CMakeLists.txt
View File

@@ -48,10 +48,6 @@ if(${Qt5_VERSION} VERSION_LESS "6.2.0")
perfprofiler.qrc perfprofiler.qrc
) )
else() # < Qt 6.2 else() # < Qt 6.2
if (NOT TARGET PerfProfiler)
return()
endif()
add_qtc_plugin(PerfProfiler add_qtc_plugin(PerfProfiler
DEPENDS Tracing Qt5::QuickWidgets DEPENDS Tracing Qt5::QuickWidgets
PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport
@@ -59,6 +55,10 @@ else() # < Qt 6.2
${TEST_SOURCES} ${TEST_SOURCES}
) )
if (NOT TARGET PerfProfiler)
return()
endif()
qt_add_resources(PerfProfiler perfprofiler qt_add_resources(PerfProfiler perfprofiler
PREFIX "/perfprofiler" PREFIX "/perfprofiler"
tracepoints.sh tracepoints.sh

8
src/plugins/qmlprofiler/CMakeLists.txt
View File

@@ -79,10 +79,6 @@ if(${Qt5_VERSION} VERSION_LESS "6.2.0")
qml/qmlprofiler.qrc qml/qmlprofiler.qrc
) )
else() # < Qt 6.2 else() # < Qt 6.2
if (NOT TARGET QmlProfiler)
return()
endif()
add_qtc_plugin(QmlProfiler add_qtc_plugin(QmlProfiler
DEPENDS QmlDebug QmlJS Tracing Qt5::QuickWidgets DEPENDS QmlDebug QmlJS Tracing Qt5::QuickWidgets
PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport TextEditor PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport TextEditor
@@ -90,6 +86,10 @@ else() # < Qt 6.2
${TEST_SOURCES} ${TEST_SOURCES}
) )
if (NOT TARGET QmlProfiler)
return()
endif()
set(QMLPROFILER_QML_FILES set(QMLPROFILER_QML_FILES
qml/QmlProfilerFlameGraphView.qml qml/QmlProfilerFlameGraphView.qml
) )