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

DebuggingHelpers: Check for Qt version instead checking private files

Browse Source 
The location private includes might still change with 4.7.1 . Better
check the qt version string.

Reviewed-by: Lasse Holmstedt
This commit is contained in:
Kai Koehne
2010-09-29 16:40:13 +02:00
parent a9514a3882
commit 88a36fe34c
7 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libs/utils/buildablehelperlibrary.cpp
View File

@@ -101,6 +101,33 @@ QString BuildableHelperLibrary::qtVersionForQMake(const QString &qmakePath)
return QString();
}
bool BuildableHelperLibrary::checkMinimumQtVersion(const QString &qtVersionString, int majorVersion, int minorVersion, int patchVersion)
{
int major = -1;
int minor = -1;
int patch = -1;
// check format
QRegExp qtVersionRegex(QLatin1String("^\\d+\\.\\d+\\.\\d+$"));
if (!qtVersionRegex.exactMatch(qtVersionString))
return false;
QStringList parts = qtVersionString.split(QLatin1Char('.'));
major = parts.at(0).toInt();
minor = parts.at(1).toInt();
patch = parts.at(2).toInt();
if (major == majorVersion) {
if (minor == minorVersion) {
if (patch >= patchVersion)
return true;
} else if (minor > minorVersion)
return true;
}
return false;
}
QStringList BuildableHelperLibrary::possibleQMakeCommands()
{
// On windows no one has renamed qmake, right?