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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/libs/utils/tcpportsgatherer.h

Change-Id: I495f3e05789f09efb8b1e84827893423a5b5b60c
This commit is contained in:
Eike Ziller
2016-04-05 14:11:47 +02:00
parent c8c6c8ec50 1ec4bbb029
commit 1ae483fc83
45 changed files with 165 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ void IosProbe::setupDefaultToolchains(const QString &devPath, const QString &xco
if (name != QLatin1String("macosx") && name != QLatin1String("iphoneos")
&& name != QLatin1String("iphonesimulator"))
{
qCWarning(probeLog) << indent << QString::fromLatin1("Skipping unknown platform %1").arg(name);
qCDebug(probeLog) << indent << QString::fromLatin1("Skipping unknown platform %1").arg(name);
continue;
}