Remove existence test for LICENSE.LGPL3

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>

2 files changed, 6 insertions, 14 deletions

diff --git a/configure b/configure
index 0e9b16fcd8..efcfd7b3bf 100755
--- a/configure
+++ b/configure
@@ -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."
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ef71097497..be692f98c2 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -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;