diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2009-11-19 18:25:06 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2009-11-19 18:25:06 (GMT) |
| commit | 9e75354eabbc3c58472ed0c3dc9cba831827c38a (patch) | |
| tree | cc8d692ae3990cff24b0f78e370e6a7add3fafef | |
| parent | 2a444790abd05de2dd5aa546ad1745f911f2a73c (diff) | |
| download | Qt-9e75354eabbc3c58472ed0c3dc9cba831827c38a.zip Qt-9e75354eabbc3c58472ed0c3dc9cba831827c38a.tar.gz Qt-9e75354eabbc3c58472ed0c3dc9cba831827c38a.tar.bz2 | |
fix accepting of old license keys (pre 4.6)
Reviewed-by: Thiago Macieira
| -rwxr-xr-x | configure.exe | bin | 1175040 -> 1175040 bytes | |||
| -rw-r--r-- | tools/configure/tools.cpp | 7 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex a970696..351ed04 100755 --- a/configure.exe +++ b/configure.exe diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index 76063e4..7412677 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -163,10 +163,13 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString case PL('X','C'): case PL('X','U'): case PL('X','W'): + case PL('X','M'): // old license key dictionary["LICENSE_EXTENSION"] = "-ALLOS"; break; + case PL('6', 'M'): case PL('8', 'M'): + case PL('K', 'M'): // old license key case PL('N', '7'): case PL('N', '9'): case PL('N', 'X'): @@ -178,7 +181,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString if (dictionary["PLATFORM NAME"].contains("Windows CE") && platformCode != PL('6', 'M') && platformCode != PL('S', '9') && platformCode != PL('S', 'C') && platformCode != PL('S', 'U') - && platformCode != PL('S', 'W')) { + && platformCode != PL('S', 'W') && platformCode != PL('K', 'M')) { dictionary["DONE"] = "error"; } else if (dictionary["PLATFORM NAME"].contains("Symbian") && platformCode != PL('N', '9') && platformCode != PL('S', '9') @@ -196,7 +199,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString break; default: dictionary["DONE"] = "error"; - return; + break; } #undef PL |