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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/projectexplorer/editorconfiguration.cpp
	src/plugins/projectexplorer/projectfilewizardextension.cpp
	src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp

Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1
This commit is contained in:
Eike Ziller
2014-08-15 14:42:30 +02:00
parent 23536e9b42 8c133689be
commit d9d0aba1c4
103 changed files with 8606 additions and 4414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ static int compareVersions(const QString &v1, const QString &v2)
QStringList v1L = v1.split(QLatin1Char('.'));
QStringList v2L = v2.split(QLatin1Char('.'));
int i = 0;
while (v1.length() > i && v1.length() > i) {
while (v1L.length() > i && v2L.length() > i) {
bool n1Ok, n2Ok;
int n1 = v1L.value(i).toInt(&n1Ok);
int n2 = v2L.value(i).toInt(&n2Ok);
@@ -77,9 +77,9 @@ static int compareVersions(const QString &v1, const QString &v2)
return 1;
++i;
}
if (v1.length() > v2.length())
if (v1L.length() > v2L.length())
return -1;
if (v1.length() < v2.length())
if (v1L.length() < v2L.length())
return 1;
return 0;
}