1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the name of the GPLv3 license file

Browse Source 
Qt 4 used to have it called LICENSE.GPL3 since we used to have GPLv2 as
an option before Qt 4.5 (which is when we added the LGPL v2.1). Looks
like no one realized that the configure script looks for that file when
LICENSE.GPL was added to the modularized repositories...

Task-number: QTBUG-37175
Change-Id: Iffb35adf128c3e49a7a0c12dbccd5ebe9bccf3f2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Thiago Macieira 2014-03-04 08:44:51 -08:00 committed by The Qt Project
parent 736d7a26cd
commit 02c8306da6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -2962,7 +2962,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then
;; ;;
esac esac
if [ '!' -f "$outpath/LICENSE" ]; then if [ '!' -f "$outpath/LICENSE" ]; then
echo "The LICENSE, LICENSE.GPL3 LICENSE.LGPL file shipped with" echo "The LICENSE, LICENSE.GPL LICENSE.LGPL file shipped with"
echo "this software has disappeared." echo "this software has disappeared."
echo echo
echo "Sorry, you are not licensed to use this software." echo "Sorry, you are not licensed to use this software."
@ -2999,7 +2999,7 @@ if [ "$Edition" = "OpenSource" ]; then
while true; do while true; do
echo "You are licensed to use this software under the terms of" echo "You are licensed to use this software under the terms of"
echo "the Lesser GNU General Public License (LGPL) versions 2.1." echo "the Lesser GNU General Public License (LGPL) versions 2.1."
if [ -f "$relpath/LICENSE.GPL3" ]; then if [ -f "$relpath/LICENSE.GPL" ]; then
echo "You are also licensed to use this software under the terms of" echo "You are also licensed to use this software under the terms of"
echo "the GNU General Public License (GPL) versions 3." echo "the GNU General Public License (GPL) versions 3."
affix="either" affix="either"
@ -3011,7 +3011,7 @@ if [ "$Edition" = "OpenSource" ]; then
echo "You have already accepted the terms of the $LicenseType license." echo "You have already accepted the terms of the $LicenseType license."
acceptance=yes acceptance=yes
else else
if [ -f "$relpath/LICENSE.GPL3" ]; then if [ -f "$relpath/LICENSE.GPL" ]; then
echo "Type '3' to view the GNU General Public License version 3." echo "Type '3' to view the GNU General Public License version 3."
fi fi
echo "Type 'L' to view the Lesser GNU General Public License version 2.1." echo "Type 'L' to view the Lesser GNU General Public License version 2.1."
@ -3029,7 +3029,7 @@ if [ "$Edition" = "OpenSource" ]; then
echo echo
exit 1 exit 1
elif [ "$acceptance" = "3" ]; then elif [ "$acceptance" = "3" ]; then
more "$relpath/LICENSE.GPL3" more "$relpath/LICENSE.GPL"
elif [ "$acceptance" = "L" ]; then elif [ "$acceptance" = "L" ]; then
more "$relpath/LICENSE.LGPL" more "$relpath/LICENSE.LGPL"
fi fi

6
tools/configure/configureapp.cpp
View File

@ -4215,7 +4215,7 @@ bool Configure::showLicense(QString orgLicenseFile)
QString licenseFile = orgLicenseFile; QString licenseFile = orgLicenseFile;
QString theLicense; QString theLicense;
if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") { if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") {
haveGpl3 = QFile::exists(orgLicenseFile + "/LICENSE.GPL3"); haveGpl3 = QFile::exists(orgLicenseFile + "/LICENSE.GPL");
theLicense = "GNU Lesser General Public License (LGPL) version 2.1"; theLicense = "GNU Lesser General Public License (LGPL) version 2.1";
if (haveGpl3) if (haveGpl3)
theLicense += "\nor the GNU General Public License (GPL) version 3"; theLicense += "\nor the GNU General Public License (GPL) version 3";
@ -4255,7 +4255,7 @@ bool Configure::showLicense(QString orgLicenseFile)
} else { } else {
if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") { if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") {
if (accept == '3') if (accept == '3')
licenseFile = orgLicenseFile + "/LICENSE.GPL3"; licenseFile = orgLicenseFile + "/LICENSE.GPL";
else else
licenseFile = orgLicenseFile + "/LICENSE.LGPL"; licenseFile = orgLicenseFile + "/LICENSE.LGPL";
} }
@ -4292,7 +4292,7 @@ void Configure::readLicense()
dictionary["LICENSE FILE"] = sourcePath; dictionary["LICENSE FILE"] = sourcePath;
bool openSource = false; bool openSource = false;
bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL"); bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL");
if (dictionary["BUILDTYPE"] == "commercial") { if (dictionary["BUILDTYPE"] == "commercial") {
openSource = false; openSource = false;
} else if (dictionary["BUILDTYPE"] == "opensource") { } else if (dictionary["BUILDTYPE"] == "opensource") {