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

9
src/plugins/ios/iosrunconfiguration.cpp
View File

@@ -105,7 +105,6 @@ IosRunConfiguration::IosRunConfiguration(Target *target)
this, &IosRunConfiguration::deviceChanges);
}
void IosRunConfiguration::initialize(Core::Id id, const FileName &path)
{
RunConfiguration::initialize(id);
@@ -114,14 +113,6 @@ void IosRunConfiguration::initialize(Core::Id id, const FileName &path)
updateDisplayNames();
}
void IosRunConfiguration::copyFrom(const IosRunConfiguration *source)
{
RunConfiguration::copyFrom(source);
m_profilePath = source->m_profilePath;
updateDisplayNames();
}
void IosRunConfiguration::deviceChanges() {
updateDisplayNames();
updateEnabledState();

1
src/plugins/ios/iosrunconfiguration.h
View File

@@ -72,7 +72,6 @@ signals:
private:
friend class ProjectExplorer::IRunConfigurationFactory;
void initialize(Core::Id id, const Utils::FileName &path);
void copyFrom(const IosRunConfiguration *source);
void deviceChanges();
friend class IosRunConfigurationWidget;