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

CMake: Do not store the "title" in the run configuration

Browse Source 
This has been superseded by other items, most notably the buildKey.

Incidentally, even Creator 4.6 is robust enough to handle .user files
without the CMakeProjectManager.CMakeRunConfiguation.Title key without
problem.

Change-Id: Iaecb2c15b31ebfb78146c0bec8b955ae821e4499
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2018-04-24 16:52:29 +02:00
parent 1de736bb5e
commit 4ec4f111cb
2 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -40,8 +40,6 @@ using namespace ProjectExplorer;
namespace CMakeProjectManager { namespace CMakeProjectManager {
namespace Internal { namespace Internal {
const char TITLE_KEY[] = "CMakeProjectManager.CMakeRunConfiguation.Title";
CMakeRunConfiguration::CMakeRunConfiguration(Target *target, Core::Id id) CMakeRunConfiguration::CMakeRunConfiguration(Target *target, Core::Id id)
: RunConfiguration(target, id) : RunConfiguration(target, id)
{ {
@@ -68,23 +66,9 @@ CMakeRunConfiguration::CMakeRunConfiguration(Target *target, Core::Id id)
setOutputFormatter<QtSupport::QtOutputFormatter>(); setOutputFormatter<QtSupport::QtOutputFormatter>();
} }
QVariantMap CMakeRunConfiguration::toMap() const
{
QVariantMap map(RunConfiguration::toMap());
map.insert(QLatin1String(TITLE_KEY), m_title);
return map;
}
bool CMakeRunConfiguration::fromMap(const QVariantMap &map)
{
RunConfiguration::fromMap(map);
m_title = map.value(QLatin1String(TITLE_KEY)).toString();
return true;
}
void CMakeRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &info) void CMakeRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &info)
{ {
m_title = info.displayName; Q_UNUSED(info);
updateTargetInformation(); updateTargetInformation();
} }
@@ -112,8 +96,6 @@ QString CMakeRunConfiguration::disabledReason() const
void CMakeRunConfiguration::updateTargetInformation() void CMakeRunConfiguration::updateTargetInformation()
{ {
setDefaultDisplayName(m_title);
BuildTargetInfo bti = target()->applicationTargets().buildTargetInfo(buildKey()); BuildTargetInfo bti = target()->applicationTargets().buildTargetInfo(buildKey());
extraAspect<ExecutableAspect>()->setExecutable(bti.targetFilePath); extraAspect<ExecutableAspect>()->setExecutable(bti.targetFilePath);
extraAspect<WorkingDirectoryAspect>()->setDefaultWorkingDirectory(bti.workingDirectory); extraAspect<WorkingDirectoryAspect>()->setDefaultWorkingDirectory(bti.workingDirectory);

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

@@ -38,17 +38,13 @@ public:
CMakeRunConfiguration(ProjectExplorer::Target *target, Core::Id id); CMakeRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
private: private:
QVariantMap toMap() const override;
QString disabledReason() const override; QString disabledReason() const override;
bool fromMap(const QVariantMap &map) override;
void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &) override; void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &) override;
bool isBuildTargetValid() const; bool isBuildTargetValid() const;
void updateTargetInformation(); void updateTargetInformation();
void updateEnabledState() final; void updateEnabledState() final;
QString m_title;
}; };
class CMakeRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory class CMakeRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory