Merge remote-tracking branch 'origin/5.0'

Change-Id: I370268624bd6e91e7b44fa236e913f5f55867e17
2021-08-20 09:50:30 +02:00
parent 4ec490e77e c568ab89c5
commit b09b6bd747
28 changed files with 174 additions and 154 deletions
--- 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