AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove existence test for LICENSE.LGPL3

Browse Source 
This license file has to exist, since much of the code is licensed under
LGPLv3.

Change-Id: I2795a7cc62f6de65a35921e38d2ab5f8f0233f71
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2014-10-01 11:58:21 +02:00
parent d44781730c
commit 08c523a9a8
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -2828,13 +2828,9 @@ if [ "$Edition" = "OpenSource" ]; then
while true; do
echo "You are licensed to use this software under the terms of"
echo "the Lesser GNU General Public License (LGPL) versions 2.1."
if [ -f "$relpath/LICENSE.LGPLv3" ]; then
echo "You are also licensed to use this software under the terms of"
echo "the GNU Lesser General Public License (LGPL) versions 3."
affix="either"
else
affix="the"
fi
echo "You are also licensed to use this software under the terms of"
echo "the GNU Lesser General Public License (LGPL) versions 3."
affix="either"
echo
if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then
echo "You have already accepted the terms of the $EditionString license."

10
tools/configure/configureapp.cpp
View File

@ -4219,14 +4219,11 @@ bool Configure::showLicense(QString orgLicenseFile)
return true;
}
bool haveLgpl3 = false;
QString licenseFile = orgLicenseFile;
QString theLicense;
if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") {
haveLgpl3 = QFile::exists(orgLicenseFile + "/LICENSE.LGPLv3");
theLicense = "GNU Lesser General Public License (LGPL) version 2.1";
if (haveLgpl3)
theLicense += "\nor the GNU Lesser General Public License (LGPL) version 3";
theLicense = "GNU Lesser General Public License (LGPL) version 2.1"
"\nor the GNU Lesser General Public License (LGPL) version 3";
} else {
// the first line of the license file tells us which license it is
QFile file(licenseFile);
@ -4243,8 +4240,7 @@ bool Configure::showLicense(QString orgLicenseFile)
<< "the " << theLicense << "." << endl
<< endl;
if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") {
if (haveLgpl3)
cout << "Type '3' to view the Lesser GNU General Public License version 3 (LGPLv3)." << endl;
cout << "Type '3' to view the Lesser GNU General Public License version 3 (LGPLv3)." << endl;
cout << "Type 'L' to view the Lesser GNU General Public License version 2.1 (LGPLv2.1)." << endl;
} else {
cout << "Type '?' to view the " << theLicense << "." << endl;