diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-21 13:50:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-21 16:02:06 +0200 |
| commit | 22ef455c6dc7c7f5e9447a82095abd9c4b380656 (patch) | |
| tree | 0ca53597126727dea21eeb860cf76c4b11859333 /tools/configure/configureapp.cpp | |
| parent | 3042267a93831a510d805e238a9442f46c36f299 (diff) | |
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>
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 66b0fec899..050dd6b8e1 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -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"; |