Changeset 769 for trunk/tools/configure/tools.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/configure/tools.cpp (modified) (2 diffs)

trunk/tools/configure/tools.cpp

@@ -147 +147 @@
             dictionary["EDITION"] = "Evaluation";
             dictionary["QT_EDITION"] = "QT_EDITION_EVALUATION";
+            licenseType = "Evaluation";
         }
     }
@@ -213 +214 @@
 
     // Override for evaluation licenses
-    if (dictionary["Edition"] == "Evaluation")
+    if (dictionary["EDITION"] == "Evaluation")
         dictionary["LICENSE_EXTENSION"] = "-EVALUATION";