Merge remote-tracking branch 'origin/1.10'

Conflicts:
	src/lib/qtprofilesetup/qtprofilesetup.cpp
	src/lib/qtprofilesetup/templates/QtModule.qbs
	src/lib/qtprofilesetup/templates/core.qbs

Change-Id: I342608a47f1a90b53eb12cc14fc3ff116063d15f

6 files changed, 107 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/main.cpp b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/main.cpp
new file mode 100644
index 000000000..98e7b4060
--- /dev/null
+++ b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/main.cpp
@@ -0,0 +1,31 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** 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
+** 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.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+int main()
+{
+}
diff --git a/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/pch.h b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/pch.h
new file mode 100644
index 000000000..f19f4b59d
--- /dev/null
+++ b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/pch.h
@@ -0,0 +1,28 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** 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
+** 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.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
diff --git a/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/precompiled-and-prefix-headers.qbs b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/precompiled-and-prefix-headers.qbs
new file mode 100644
index 000000000..b30f76874
--- /dev/null
+++ b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/precompiled-and-prefix-headers.qbs
@@ -0,0 +1,13 @@
+import qbs
+
+CppApplication {
+    name: "MyApp"
+    consoleApplication: true
+    cpp.includePaths: [product.buildDirectory]
+    cpp.prefixHeaders: [ "prefix.h" ]
+    Group {
+        files: ["pch.h"]
+        fileTags: ["cpp_pch_src"]
+    }
+    files: ["main.cpp"]
+}
diff --git a/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/prefix.h b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/prefix.h
new file mode 100644
index 000000000..f19f4b59d
--- /dev/null
+++ b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/prefix.h
@@ -0,0 +1,28 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** 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
+** 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.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index d579445ce..0dd185f8e 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -2483,6 +2483,12 @@ void TestBlackbox::pluginDependency()
     QVERIFY(m_qbsStdout.contains("plugin4"));
 }
 
+void TestBlackbox::precompiledAndPrefixHeaders()
+{
+    QDir::setCurrent(testDataDir + "/precompiled-and-prefix-headers");
+    QCOMPARE(runQbs(), 0);
+}
+
 void TestBlackbox::probeChangeTracking()
 {
     QDir::setCurrent(testDataDir + "/probe-change-tracking");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index a068aa964..eef0af9d5 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -168,6 +168,7 @@ private slots:
     void pkgConfigProbe_data();
     void pkgConfigProbeSysroot();
     void pluginDependency();
+    void precompiledAndPrefixHeaders();
     void probeChangeTracking();
     void probeProperties();
     void probeInExportedModule();