From 22ef455c6dc7c7f5e9447a82095abd9c4b380656 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 21 May 2012 13:50:41 +0200 Subject: 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 --- tools/configure/configureapp.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tools') 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"; -- cgit v1.2.3