diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2018-03-22 14:53:53 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-03-23 10:40:28 +0000 |
| commit | 38ed8495dd2aae1eb6e3d62bf1a67f865d2ad3ef (patch) | |
| tree | caa83b2bfae230e80dca79fe791a17e7c8e39a48 /src | |
| parent | 63f31a1e4bc9e30c0a61fb08c5bb5b09bc5d2479 (diff) | |
| download | qt-creator-38ed8495dd2aae1eb6e3d62bf1a67f865d2ad3ef.tar.gz | |
CMake: Move CMake project settings page into Build & Run
Change-Id: I51d482aa0187e4fc501d6c82f506c9874ffc6551
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/cmakeprojectmanager/images/project_type_settings_icon.png | bin | 514 -> 0 bytes |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp index d9044c0fc1..a8239ced29 100644 --- a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp @@ -24,7 +24,9 @@ ****************************************************************************/ #include "cmakespecificsettingspage.h" + #include <coreplugin/icore.h> +#include <projectexplorer/projectexplorerconstants.h> 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 Binary files differdeleted file mode 100644 index 7065a51686..0000000000 --- a/src/plugins/cmakeprojectmanager/images/project_type_settings_icon.png +++ /dev/null |
