Windows-configure.exe: Do not print licensing info in log.
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Mon, 21 May 2012 11:50:41 +0000 (13:50 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 21 May 2012 14:02:06 +0000 (16:02 +0200)
The hash value is not correct after choosing a different license.
Also, Unix configure does not report it.

Change-Id: I988fffc923c3894e8141a91fc50747e30e20966b
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
tools/configure/configureapp.cpp

index 66b0fec..050dd6b 100644 (file)
@@ -2985,12 +2985,7 @@ void Configure::displayConfig()
         env = "Unset";
     sout << "    PATH=\r\n      " << env << endl;
 
-    if (dictionary["EDITION"] == "OpenSource") {
-        sout << "You are licensed to use this software under the terms of the GNU GPL version 3.";
-        sout << "You are licensed to use this software under the terms of the Lesser GNU LGPL version 2.1." << endl;
-        sout << "See " << dictionary["LICENSE FILE"] << "3" << endl << endl
-             << " or " << dictionary["LICENSE FILE"] << "L" << endl << endl;
-    } else {
+    if (dictionary[QStringLiteral("EDITION")] != QStringLiteral("OpenSource")) {
         QString l1 = licenseInfo[ "LICENSEE" ];
         QString l2 = licenseInfo[ "LICENSEID" ];
         QString l3 = dictionary["EDITION"] + ' ' + "Edition";