Merge remote-tracking branch 'origin/4.14' into master

Conflicts:
	src/plugins/cppeditor/cppquickfix_test.cpp

Change-Id: I470ee35f54f883244d819531131c172bd25c0e3f

src/plugins/cpptools/compileroptionsbuilder.cpp

@@ -298,7 +298,8 @@ void CompilerOptionsBuilder::enableExceptions()
 
 void CompilerOptionsBuilder::insertWrappedQtHeaders()
 {
-    insertWrappedHeaders(wrappedQtHeadersIncludePath());
+    if (m_useTweakedHeaderPaths == UseTweakedHeaderPaths::Yes)
+        insertWrappedHeaders(wrappedQtHeadersIncludePath());
 }
 
 void CompilerOptionsBuilder::insertWrappedMingwHeaders()

src/plugins/cpptools/compileroptionsbuilder.h

@@ -33,7 +33,7 @@ namespace CppTools {
 
 enum class UsePrecompiledHeaders : char { Yes, No };
 enum class UseSystemHeader : char { Yes, No };
-enum class UseTweakedHeaderPaths : char { Yes, No };
+enum class UseTweakedHeaderPaths : char { Yes, Tools, No };
 enum class UseToolchainMacros : char { Yes, No };
 enum class UseLanguageDefines : char { Yes, No };
 enum class UseBuildSystemWarnings : char { Yes, No };

src/plugins/cpptools/cpptools.qbs

@@ -8,6 +8,7 @@ Project {
 
     QtcPlugin {
         Depends { name: "Qt.widgets" }
+        Depends { name: "Qt.testlib"; condition: project.withAutotests }
         Depends { name: "CPlusPlus" }
         Depends { name: "Utils" }
 
@@ -216,6 +217,15 @@ Project {
             "usages.h",
         ]
 
+        Group {
+            name: "TestCase"
+            condition: qtc.testsEnabled || project.withAutotests
+            files: [
+                "cpptoolstestcase.cpp",
+                "cpptoolstestcase.h",
+            ]
+        }
+
         Group {
             name: "Tests"
             condition: qtc.testsEnabled
@@ -230,8 +240,6 @@ Project {
                 "cppsourceprocessertesthelper.cpp",
                 "cppsourceprocessertesthelper.h",
                 "cppsourceprocessor_test.cpp",
-                "cpptoolstestcase.cpp",
-                "cpptoolstestcase.h",
                 "modelmanagertesthelper.cpp",
                 "modelmanagertesthelper.h",
                 "symbolsearcher_test.cpp",