From 38ed8495dd2aae1eb6e3d62bf1a67f865d2ad3ef Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 22 Mar 2018 14:53:53 +0100 Subject: [PATCH] CMake: Move CMake project settings page into Build & Run Change-Id: I51d482aa0187e4fc501d6c82f506c9874ffc6551 Reviewed-by: Nikita Baryshnikov Reviewed-by: Eike Ziller --- .../cmakespecificsettingspage.cpp | 6 +++--- .../images/project_type_settings_icon.png | Bin 514 -> 0 bytes 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 src/plugins/cmakeprojectmanager/images/project_type_settings_icon.png diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp index d9044c0fc1f..a8239ced29a 100644 --- a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp @@ -24,7 +24,9 @@ ****************************************************************************/ #include "cmakespecificsettingspage.h" + #include +#include namespace CMakeProjectManager { namespace Internal { @@ -77,11 +79,9 @@ CMakeSpecificSettingsPage::CMakeSpecificSettingsPage(CMakeSpecificSettings *sett QObject *parent): Core::IOptionsPage(parent), m_settings(settings) { - setCategory("ProjectTypeSettingsPage"); - setDisplayName("Project-Type Settings"); - setCategoryIcon(Utils::Icon((PROJECT_TYPE_ICON))); setId("CMakeSpecificSettings"); setDisplayName(tr("CMake")); + setCategory(ProjectExplorer::Constants::BUILD_AND_RUN_SETTINGS_CATEGORY); } QWidget *CMakeSpecificSettingsPage::widget() diff --git a/src/plugins/cmakeprojectmanager/images/project_type_settings_icon.png b/src/plugins/cmakeprojectmanager/images/project_type_settings_icon.png deleted file mode 100644 index 7065a516862a1e5e8b5f6211c7735dd4558ce84d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}EX7WqAsieW95oy%9SjT% zoCO|{#S9GG!XV7ZFl&wk0|Vm{PZ!6Kh}O4L&S!}@3bgNE_0qM;d~0N}n0#_zzTP4Q zHXCk5F1yAZ{~{GDSw!Ox$k@92J6_q%B7Y$JTIcc58FSZt5^xI;H`lX$y}xGp!k4e! zU%z_vfZ~5^q4z%PX53JAeeBrnWAVN4M&(T9hFP~C$4_KlQEcBX;}H7wh)ijE-~HKh z&I%>GJLD5Pp`!eeC7%^X+tk(Vx<$Mk#1Q~GT-uwMJk UsBsAg0|Nttr>mdKI;Vst0RMaAkN^Mx