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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: I60fca091b2eac67259580acba5ae934c16d74a83
This commit is contained in:
Orgad Shaneh
2017-11-11 19:54:32 +02:00
parent cb14d74e47 5ca90a4a5e
commit d9cb19b229
51 changed files with 1930 additions and 1642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,17 +83,6 @@ void CMakeRunConfiguration::initialize(Core::Id id, const QString &target,
setDefaultDisplayName(defaultDisplayName());
}
void CMakeRunConfiguration::copyFrom(const CMakeRunConfiguration *source)
{
RunConfiguration::copyFrom(source);
m_buildSystemTarget = source->m_buildSystemTarget;
m_executable = source->m_executable;
m_title = source->m_title;
setDefaultDisplayName(defaultDisplayName());
}
Runnable CMakeRunConfiguration::runnable() const
{
StandardRunnable r;

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

@@ -59,7 +59,6 @@ public:
private:
void initialize(Core::Id id, const QString &target,
const Utils::FileName &workingDirectory, const QString &title);
void copyFrom(const CMakeRunConfiguration *source);
bool fromMap(const QVariantMap &map) override;
QString defaultDisplayName() const;