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

QtVersionManager: Introduce qtVersionNumber + various fixes

Browse Source 
Make the internal data structure a map from id to Version, simplfing a few
functions. Return sorted lists, with newer versions in front for various
functions, e.g. validVersions(), versionsForTargetId.
This commit is contained in:
dt
2011-02-21 12:16:20 +01:00
parent ac0cf764fd
commit a9963b6313
7 changed files with 154 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,33 +110,6 @@ 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
static 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?