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

CMakeProjectManager: Export CMake*Aspect and CMakeConfigItem

Browse Source 
Allow other plugins to set CMake specific Kit options.

Change-Id: I038e9fabc3d2cb8cc463adafebecd51b21ef3d05
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Alessandro Portale
2019-09-25 18:50:58 +02:00
parent 505e9e10a1
commit 718af236de
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakeconfigitem.h
View File

@@ -25,6 +25,8 @@
#pragma once #pragma once
#include "cmake_global.h"
#include <utils/optional.h> #include <utils/optional.h>
#include <QByteArray> #include <QByteArray>
@@ -40,7 +42,7 @@ class MacroExpander;
namespace CMakeProjectManager { namespace CMakeProjectManager {
class CMakeConfigItem { class CMAKE_EXPORT CMakeConfigItem {
public: public:
enum Type { FILEPATH, PATH, BOOL, STRING, INTERNAL, STATIC }; enum Type { FILEPATH, PATH, BOOL, STRING, INTERNAL, STATIC };
CMakeConfigItem(); CMakeConfigItem();

2
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -58,7 +58,6 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace CMakeProjectManager { namespace CMakeProjectManager {
namespace Internal {
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// CMakeKitAspect: // CMakeKitAspect:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@@ -1075,5 +1074,4 @@ KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const
return new CMakeConfigurationKitAspectWidget(k, this); return new CMakeConfigurationKitAspectWidget(k, this);
} }
} // namespace Internal
} // namespace CMakeProjectManager } // namespace CMakeProjectManager

11
src/plugins/cmakeprojectmanager/cmakekitinformation.h
View File

@@ -25,6 +25,8 @@
#pragma once #pragma once
#include "cmake_global.h"
#include "cmakeconfigitem.h" #include "cmakeconfigitem.h"
#include <projectexplorer/kitmanager.h> #include <projectexplorer/kitmanager.h>
@@ -32,9 +34,7 @@
namespace CMakeProjectManager { namespace CMakeProjectManager {
class CMakeTool; class CMakeTool;
namespace Internal { class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspect
class CMakeKitAspect : public ProjectExplorer::KitAspect
{ {
Q_OBJECT Q_OBJECT
public: public:
@@ -58,7 +58,7 @@ public:
QSet<Core::Id> availableFeatures(const ProjectExplorer::Kit *k) const final; QSet<Core::Id> availableFeatures(const ProjectExplorer::Kit *k) const final;
}; };
class CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect
{ {
Q_OBJECT Q_OBJECT
public: public:
@@ -88,7 +88,7 @@ private:
QVariant defaultValue(const ProjectExplorer::Kit *k) const; QVariant defaultValue(const ProjectExplorer::Kit *k) const;
}; };
class CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect class CMAKE_EXPORT CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect
{ {
Q_OBJECT Q_OBJECT
public: public:
@@ -113,5 +113,4 @@ private:
QVariant defaultValue(const ProjectExplorer::Kit *k) const; QVariant defaultValue(const ProjectExplorer::Kit *k) const;
}; };
} // namespace Internal
} // namespace CMakeProjectManager } // namespace CMakeProjectManager