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

ios: single xcode and cleaned configurations

Browse Source 
Use just one xcode, namely the one of xcode-select (like qmake)
cleaned iosconfigurations:
 * cleaned now unneded xcode paths
 * using static methods, removed IosConfig

Change-Id: Icc4d1bc1063a5f65230736a47b4ca9b139fa79e0
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Fawzi Mohamed
2013-10-07 20:14:54 +02:00
committed by hjk
parent 23673655bf
commit 8fbb44bd18
11 changed files with 87 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/ios/iosprobe.cpp
View File

@@ -52,7 +52,7 @@ QMap<QString, Platform> IosProbe::detectPlatforms(const QString &devPath)
{
IosProbe probe;
probe.addDeveloperPath(devPath);
probe.detectAll();
probe.detectFirst();
return probe.detectedPlatforms();
}
@@ -331,14 +331,11 @@ void IosProbe::setupDefaultToolchains(const QString &devPath, const QString &xco
}
}
void IosProbe::detectAll()
void IosProbe::detectFirst()
{
detectDeveloperPaths();
QString xcodeName = QLatin1String("");
for (int iXcode = 0; iXcode < m_developerPaths.count(); ++iXcode) {
setupDefaultToolchains(m_developerPaths.value(iXcode), xcodeName);
xcodeName = QString::fromLatin1("-%1").arg(iXcode + 2);
}
if (!m_developerPaths.isEmpty())
setupDefaultToolchains(m_developerPaths.value(0),QLatin1String(""));
}
QMap<QString, Platform> IosProbe::detectedPlatforms()