From 9cc2b7aaf385a52ee602954163817bf44c9f2bec Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 17 Nov 2021 07:46:17 +0100 Subject: [PATCH] qmake/qbs/CMake builds: Remove "recommended" dependency on Designer Recommendation of Designer is the artifact from an earlier solution for adding code of .ui files to the code model. The refactoring of extra compilers made that superfluous, this change removes the left-over traces. The CMake build of Qt Creator breaks because of the recommendation if the qttols module is not installed. Amends: 78d3191363883db7023a5933a18b29c716b73d7d Change-Id: I64827492d79a9238dc8512047abd581f9da3189e Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/CMakeLists.txt | 1 - src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs | 4 ---- .../cmakeprojectmanager/cmakeprojectmanager_dependencies.pri | 2 -- src/plugins/mesonprojectmanager/CMakeLists.txt | 1 - src/plugins/mesonprojectmanager/mesonprojectmanager.qbs | 4 ---- .../mesonprojectmanager/mesonprojectmanager_dependencies.pri | 3 --- src/plugins/qmakeprojectmanager/CMakeLists.txt | 1 - src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs | 4 ---- .../qmakeprojectmanager/qmakeprojectmanager_dependencies.pri | 3 --- 9 files changed, 23 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/CMakeLists.txt b/src/plugins/cmakeprojectmanager/CMakeLists.txt index 8741c5520c5..ce6b8f8ce1e 100644 --- a/src/plugins/cmakeprojectmanager/CMakeLists.txt +++ b/src/plugins/cmakeprojectmanager/CMakeLists.txt @@ -1,7 +1,6 @@ add_qtc_plugin(CMakeProjectManager DEPENDS QmlJS PLUGIN_DEPENDS Core CppEditor ProjectExplorer TextEditor QtSupport - PLUGIN_RECOMMENDS Designer SOURCES builddirparameters.cpp builddirparameters.h cmake_global.h diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs index dac2e995922..077b700919e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs @@ -14,10 +14,6 @@ QtcPlugin { Depends { name: "QtSupport" } Depends { name: "app_version_header" } - pluginRecommends: [ - "Designer" - ] - files: [ "builddirparameters.cpp", "builddirparameters.h", diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri index 95496a600c9..b454c4a41f9 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri @@ -9,5 +9,3 @@ QTC_PLUGIN_DEPENDS += \ cppeditor \ texteditor \ qtsupport -QTC_PLUGIN_RECOMMENDS += \ - designer diff --git a/src/plugins/mesonprojectmanager/CMakeLists.txt b/src/plugins/mesonprojectmanager/CMakeLists.txt index 1e2aef3744e..5486bd44773 100644 --- a/src/plugins/mesonprojectmanager/CMakeLists.txt +++ b/src/plugins/mesonprojectmanager/CMakeLists.txt @@ -1,7 +1,6 @@ add_qtc_plugin(MesonProjectManager DEPENDS QmlJS PLUGIN_DEPENDS Core CppEditor ProjectExplorer TextEditor QtSupport - PLUGIN_RECOMMENDS Designer SOURCES mesonprojectplugin.cpp mesonprojectplugin.h diff --git a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs index 2aed9f3b783..3a9ce46d718 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs +++ b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs @@ -17,10 +17,6 @@ Project { Depends { name: "QtSupport" } Depends { name: "app_version_header" } - pluginRecommends: [ - "Designer" - ] - cpp.includePaths: "." files: [ diff --git a/src/plugins/mesonprojectmanager/mesonprojectmanager_dependencies.pri b/src/plugins/mesonprojectmanager/mesonprojectmanager_dependencies.pri index 043a2913411..0bfe8ce98c5 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectmanager_dependencies.pri +++ b/src/plugins/mesonprojectmanager/mesonprojectmanager_dependencies.pri @@ -7,6 +7,3 @@ QTC_PLUGIN_DEPENDS += \ projectexplorer \ cppeditor \ qtsupport -QTC_PLUGIN_RECOMMENDS += \ - designer - diff --git a/src/plugins/qmakeprojectmanager/CMakeLists.txt b/src/plugins/qmakeprojectmanager/CMakeLists.txt index 842a8b2063c..e1d3ddf2644 100644 --- a/src/plugins/qmakeprojectmanager/CMakeLists.txt +++ b/src/plugins/qmakeprojectmanager/CMakeLists.txt @@ -1,7 +1,6 @@ add_qtc_plugin(QmakeProjectManager DEPENDS QmlJS PLUGIN_DEPENDS Core CppEditor QtSupport ResourceEditor TextEditor - PLUGIN_RECOMMENDS Designer SOURCES addlibrarywizard.cpp addlibrarywizard.h customwidgetwizard/classdefinition.cpp customwidgetwizard/classdefinition.h customwidgetwizard/classdefinition.ui diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs index e01e29703fb..233dbef2035 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs @@ -16,10 +16,6 @@ Project { Depends { name: "ResourceEditor" } Depends { name: "app_version_header" } - pluginRecommends: [ - "Designer" - ] - Group { name: "General" files: [ diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri b/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri index a4e2c593d16..daa8e231be2 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri @@ -10,6 +10,3 @@ QTC_PLUGIN_DEPENDS += \ texteditor \ cppeditor \ resourceeditor - -QTC_PLUGIN_RECOMMENDS += \ - designer