From e4a081c1c3c780e0fdfe4d8e6c72322f64145119 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@nokia.com>
Date: Thu, 19 Nov 2009 19:25:06 +0100
Subject: fix accepting of old license keys (pre 4.6)

Reviewed-by: Thiago Macieira
(cherry picked from commit 9e75354eabbc3c58472ed0c3dc9cba831827c38a)
---
 configure.exe             | Bin 1175040 -> 1175040 bytes
 tools/configure/tools.cpp |   7 +++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.exe b/configure.exe
index a970696..351ed04 100755
Binary files a/configure.exe and b/configure.exe differ
diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp
index cceaf3f..ca534a4 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
 
-- 
cgit v0.12