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

Remove LGPLv2 as a license option in configure

Browse Source 
Instead show LGPLv3 and GPLv2 as valid options for the
open source edition.

Change-Id: Id7a203226428031ec873cbaf106dca14a854f155
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-02-12 21:46:51 +01:00
parent 8204a4db05
commit c7c7cf636b
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure vendored
View File

@ -3087,7 +3087,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then
exit 1 exit 1
fi fi
elif [ $COMMERCIAL_USER = "no" ]; then elif [ $COMMERCIAL_USER = "no" ]; then
# Open Source edition - may only be used under the terms of the LGPLv3 or LGPLv21. # Open Source edition - may only be used under the terms of the LGPLv3 or GPLv2.
Licensee="Open Source" Licensee="Open Source"
Edition="OpenSource" Edition="OpenSource"
EditionString="Open Source" EditionString="Open Source"
@ -3103,15 +3103,15 @@ if [ "$Edition" = "OpenSource" ]; then
while true; do while true; do
if [ "$CFG_ANDROID_STYLE_ASSETS" = "no" ] || [ "$XPLATFORM_ANDROID" = "no" ]; then if [ "$CFG_ANDROID_STYLE_ASSETS" = "no" ] || [ "$XPLATFORM_ANDROID" = "no" ]; then
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 "You are also licensed to use this software under the terms of"
echo "the GNU Lesser General Public License (LGPL) versions 3." echo "the GNU Lesser General Public License (LGPL) versions 3."
echo "You are also licensed to use this software under the terms of"
echo "the GNU General Public License (GPL) versions 2."
affix="either" affix="either"
showLGPL2="yes" showGPL2="yes"
else else
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 GNU Lesser General Public License (LGPL) versions 3." echo "the GNU Lesser General Public License (LGPL) versions 3."
showLGPL2="no" showGPL2="no"
affix="the" affix="the"
fi fi
@ -3120,11 +3120,11 @@ if [ "$Edition" = "OpenSource" ]; then
echo "You have already accepted the terms of the $EditionString license." echo "You have already accepted the terms of the $EditionString license."
acceptance=yes acceptance=yes
else else
if [ -f "$relpath/LICENSE.LGPLv3" ]; then if [ -f "$relpath/LICENSE.LGPL3" ]; then
echo "Type '3' to view the GNU Lesser General Public License version 3." echo "Type 'L' to view the GNU Lesser General Public License version 3."
fi fi
if [ "$showLGPL2" = "yes" ]; then if [ "$showGPL2" = "yes" ]; then
echo "Type 'L' to view the Lesser GNU General Public License version 2.1." echo "Type 'G' to view the GNU General Public License version 2."
fi fi
echo "Type 'yes' to accept this license offer." echo "Type 'yes' to accept this license offer."
echo "Type 'no' to decline this license offer." echo "Type 'no' to decline this license offer."
@ -3139,10 +3139,10 @@ if [ "$Edition" = "OpenSource" ]; then
echo "You are not licensed to use this software." echo "You are not licensed to use this software."
echo echo
exit 1 exit 1
elif [ "$acceptance" = "3" ]; then elif [ "$acceptance" = "L" ]; then
more "$relpath/LICENSE.LGPLv3" more "$relpath/LICENSE.LGPL3"
elif [ "$acceptance" = "L" ] && [ "$showLGPL2" = "yes" ]; then elif [ "$acceptance" = "G" ] && [ "$showGPL2" = "yes" ]; then
more "$relpath/LICENSE.LGPLv21" more "$relpath/LICENSE.GPL2"
fi fi
done done
elif [ "$Edition" = "Preview" ]; then elif [ "$Edition" = "Preview" ]; then

22
tools/configure/configureapp.cpp
View File

@ -4539,18 +4539,18 @@ bool Configure::showLicense(QString orgLicenseFile)
return true; return true;
} }
bool showLgpl2 = true; bool showGpl2 = true;
QString licenseFile = orgLicenseFile; QString licenseFile = orgLicenseFile;
QString theLicense; QString theLicense;
if (dictionary["EDITION"] == "OpenSource") { if (dictionary["EDITION"] == "OpenSource") {
if (platform() != WINDOWS_RT if (platform() != WINDOWS_RT
&& platform() != WINDOWS_CE && platform() != WINDOWS_CE
&& (platform() != ANDROID || dictionary["ANDROID_STYLE_ASSETS"] == "no")) { && (platform() != ANDROID || dictionary["ANDROID_STYLE_ASSETS"] == "no")) {
theLicense = "GNU Lesser General Public License (LGPL) version 2.1" theLicense = "GNU Lesser General Public License (LGPL) version 3\n"
"\nor the GNU Lesser General Public License (LGPL) version 3"; "or the GNU General Public License (GPL) version 2";
} else { } else {
theLicense = "GNU Lesser General Public License (LGPL) version 3"; theLicense = "GNU Lesser General Public License (LGPL) version 3";
showLgpl2 = false; showGpl2 = false;
} }
} else { } else {
// the first line of the license file tells us which license it is // the first line of the license file tells us which license it is
@ -4568,9 +4568,9 @@ bool Configure::showLicense(QString orgLicenseFile)
<< "the " << theLicense << "." << endl << "the " << theLicense << "." << endl
<< endl; << endl;
if (dictionary["EDITION"] == "OpenSource") { if (dictionary["EDITION"] == "OpenSource") {
cout << "Type '3' to view the Lesser GNU General Public License version 3 (LGPLv3)." << endl; cout << "Type 'L' to view the GNU Lesser General Public License version 3 (LGPLv3)." << endl;
if (showLgpl2) if (showGpl2)
cout << "Type 'L' to view the Lesser GNU General Public License version 2.1 (LGPLv2.1)." << endl; cout << "Type 'G' to view the GNU General Public License version 2 (GPLv2)." << endl;
} else { } else {
cout << "Type '?' to view the " << theLicense << "." << endl; cout << "Type '?' to view the " << theLicense << "." << endl;
} }
@ -4587,10 +4587,10 @@ bool Configure::showLicense(QString orgLicenseFile)
return false; return false;
} else { } else {
if (dictionary["EDITION"] == "OpenSource") { if (dictionary["EDITION"] == "OpenSource") {
if (accept == '3') if (accept == 'L')
licenseFile = orgLicenseFile + "/LICENSE.LGPLv3"; licenseFile = orgLicenseFile + "/LICENSE.LGPL3";
else else
licenseFile = orgLicenseFile + "/LICENSE.LGPLv21"; licenseFile = orgLicenseFile + "/LICENSE.GPL2";
} }
// Get console line height, to fill the screen properly // Get console line height, to fill the screen properly
int i = 0, screenHeight = 25; // default int i = 0, screenHeight = 25; // default
@ -4625,7 +4625,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.LGPLv3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPLv21"); bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL2");
if (dictionary["BUILDTYPE"] == "commercial") { if (dictionary["BUILDTYPE"] == "commercial") {
openSource = false; openSource = false;
} else if (dictionary["BUILDTYPE"] == "opensource") { } else if (dictionary["BUILDTYPE"] == "opensource") {