diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-17 09:04:19 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-17 14:12:04 (GMT) |
| commit | fc1f21b62243bc377889bf142da3b6ecad05aff0 (patch) | |
| tree | 76072382b0967389a77de1ee93a930d7a99917bb | |
| parent | 340b44156245a520e53119815670becd3eb7fb70 (diff) | |
| download | Qt-fc1f21b62243bc377889bf142da3b6ecad05aff0.zip Qt-fc1f21b62243bc377889bf142da3b6ecad05aff0.tar.gz Qt-fc1f21b62243bc377889bf142da3b6ecad05aff0.tar.bz2 | |
Fix handling of Evaluation licenses on the Windows configure.exe
Reviewed-By: Marius Storm-Olsen
| -rwxr-xr-x[-rw-r--r--] | configure.exe | bin | 1180160 -> 1179136 bytes | |||
| -rw-r--r-- | tools/configure/tools.cpp | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex 8913de1..09f4ef2 100644..100755 --- a/configure.exe +++ b/configure.exe diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index aea2713..c4625af 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -146,6 +146,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString if (products == 'B') { dictionary["EDITION"] = "Evaluation"; dictionary["QT_EDITION"] = "QT_EDITION_EVALUATION"; + licenseType = "Evaluation"; } } @@ -212,7 +213,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString } // Override for evaluation licenses - if (dictionary["Edition"] == "Evaluation") + if (dictionary["EDITION"] == "Evaluation") dictionary["LICENSE_EXTENSION"] = "-EVALUATION"; if (QFile::exists(dictionary["QT_SOURCE_TREE"] + "/.LICENSE")) { |