summaryrefslogtreecommitdiff
path: root/src/libs
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2011-02-21 12:16:20 +0100
committerdt <qtc-committer@nokia.com>2011-02-22 15:35:23 +0100
commita9963b631387f733d056744d03cb78cc076b6977 (patch)
treef4a0a6f4d461901d7c5e1033d79af1d859c62697 /src/libs
parentac0cf764fd64c9e3a630730e671694de1045d680 (diff)
downloadqt-creator-a9963b631387f733d056744d03cb78cc076b6977.tar.gz
QtVersionManager: Introduce qtVersionNumber + various fixes
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.
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/utils/buildablehelperlibrary.cpp27
1 files changed, 0 insertions, 27 deletions
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp
index 809aab9b85..2a9ccafe64 100644
--- a/src/libs/utils/buildablehelperlibrary.cpp
+++ b/src/libs/utils/buildablehelperlibrary.cpp
@@ -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?