From fc1f21b62243bc377889bf142da3b6ecad05aff0 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Wed, 17 Feb 2010 10:04:19 +0100
Subject: Fix handling of Evaluation licenses on the Windows configure.exe

Reviewed-By: Marius Storm-Olsen
---
 configure.exe             | Bin 1180160 -> 1179136 bytes
 tools/configure/tools.cpp |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 configure.exe

diff --git a/configure.exe b/configure.exe
old mode 100644
new mode 100755
index 8913de1..09f4ef2
Binary files a/configure.exe and b/configure.exe differ
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")) {
-- 
cgit v0.12