summaryrefslogtreecommitdiff
path: root/src/plugins/ios/iosprobe.cpp
diff options
context:
space:
mode:
authorFawzi Mohamed <fawzi.mohamed@digia.com>2013-10-07 20:14:54 +0200
committerhjk <hjk121@nokiamail.com>2013-10-14 16:49:53 +0200
commit8fbb44bd18b4150d01adfd5d9154368d5fc46160 (patch)
tree8c50ac207076d99adceccef880e02ce3db5b2733 /src/plugins/ios/iosprobe.cpp
parent23673655bfe9724d003568362da91da3cb637b99 (diff)
downloadqt-creator-8fbb44bd18b4150d01adfd5d9154368d5fc46160.tar.gz
ios: single xcode and cleaned configurations
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>
Diffstat (limited to 'src/plugins/ios/iosprobe.cpp')
-rw-r--r--src/plugins/ios/iosprobe.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp
index efc7b81011..228daffe30 100644
--- a/src/plugins/ios/iosprobe.cpp
+++ b/src/plugins/ios/iosprobe.cpp
@@ -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()