whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows-configure.exe: Do not print licensing info in log. 

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>
bb10
Friedemann Kleint 2012-05-21 13:50:41 +02:00 committed by Qt by Nokia
parent 3042267a93
commit 22ef455c6d
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/configure/configureapp.cpp
View 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";