Merge 1.11 into master

Change-Id: I15cdc5c73a13c36cf073d01aff0406e539bb507b

3 files changed, 17 insertions, 5 deletions

diff --git a/src/lib/corelib/use_installed_corelib.pri b/src/lib/corelib/use_installed_corelib.pri
index fefa774ff..4ff72414d 100644
--- a/src/lib/corelib/use_installed_corelib.pri
+++ b/src/lib/corelib/use_installed_corelib.pri
@@ -29,7 +29,7 @@ win32 {
     LIBS += $$QBSCORELIB
 }
 
-INCLUDEPATH += $${PWD} $${PWD}/..
+INCLUDEPATH += $${PWD}
 
 CONFIG(static, static|shared) {
     DEFINES += QBS_STATIC_LIB
diff --git a/src/libexec/qbs_processlauncher/processlauncher-main.cpp b/src/libexec/qbs_processlauncher/processlauncher-main.cpp
index e4850cff9..2c042603a 100644
--- a/src/libexec/qbs_processlauncher/processlauncher-main.cpp
+++ b/src/libexec/qbs_processlauncher/processlauncher-main.cpp
@@ -5,7 +5,7 @@
 **
 ** This file is part of Qbs.
 **
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
@@ -14,13 +14,24 @@
 ** and conditions see https://www.qt.io/terms-conditions. For further
 ** information use the contact form at https://www.qt.io/contact-us.
 **
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
 ** included in the packaging of this file. Please review the following
 ** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/packages/archive/archive.qbs b/src/packages/archive/archive.qbs
index 6cdec470e..007b6af92 100644
--- a/src/packages/archive/archive.qbs
+++ b/src/packages/archive/archive.qbs
@@ -55,6 +55,7 @@ QbsProduct {
             "LGPL_EXCEPTION.txt",
             "LICENSE.LGPLv3",
             "LICENSE.LGPLv21",
+            "LICENSE.GPL3-EXCEPT",
         ]
         qbs.install: true
         qbs.installDir: "share/doc/qbs"