qbs project files: Make use of new qbsSearchPaths property.

Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

src/libs/QtcLibrary.qbs → qbs/imports/QtcLibrary.qbs

 import qbs.base 1.0
-import "../../qbs/functions.js" as QtcFunctions
+import QtcFunctions
 
 DynamicLibrary {
     Depends { name: "cpp" }
@@ -22,11 +22,12 @@ DynamicLibrary {
     cpp.rpaths: qbs.targetOS.contains("osx")
             ? ["@loader_path/..", "@executable_path/.."]
             : ["$ORIGIN", "$ORIGIN/.."]
-    cpp.includePaths: [path]
+    property string libIncludeBase: ".." // #include <lib/header.h>
+    cpp.includePaths: [libIncludeBase]
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: [path]
+        cpp.includePaths: [libIncludeBase]
     }
 
     Group {

src/plugins/QtcPlugin.qbs → qbs/imports/QtcPlugin.qbs

 import qbs.base 1.0
 import qbs.FileInfo
-import "../../qbs/functions.js" as QtcFunctions
+import QtcFunctions
 
 Product {
     type: ["dynamiclibrary", "pluginSpec"]
@@ -33,7 +33,9 @@ Product {
         else if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc"))
             return ["/INCREMENTAL:NO"] // Speed up startup time when debugging with cdb
     }
-    cpp.includePaths: [path]
+
+    property string pluginIncludeBase: ".." // #include <plugin/header.h>
+    cpp.includePaths: [pluginIncludeBase]
 
     Group {
         name: "PluginSpec"
@@ -55,6 +57,6 @@ Product {
     Export {
         Depends { name: "ExtensionSystem" }
         Depends { name: "cpp" }
-        cpp.includePaths: [path]
+        cpp.includePaths: [pluginIncludeBase]
     }
 }

qtcreator.qbs

@@ -52,7 +52,7 @@ Project {
         "QT_NO_CAST_TO_ASCII",
         "QT_NO_CAST_FROM_ASCII"
     ].concat(testsEnabled ? ["WITH_TESTS"] : [])
-    moduleSearchPaths: "qbs"
+    qbsSearchPaths: "qbs"
 
     references: [
         "src/src.qbs",

src/libs/aggregation/aggregation.qbs

 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "Aggregation"

src/libs/cplusplus/cplusplus.qbs

 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "CPlusPlus"

src/libs/extensionsystem/extensionsystem.qbs

 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "ExtensionSystem"

src/libs/glsl/glsl.qbs

 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "GLSL"

src/libs/languageutils/languageutils.qbs

 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "LanguageUtils"

src/libs/qmldebug/qmldebug.qbs

 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "QmlDebug"

src/libs/qmleditorwidgets/qmleditorwidgets.qbs

 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "QmlEditorWidgets"

src/libs/qmljs/qmljs.qbs

 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "QmlJS"

src/libs/ssh/ssh.qbs

 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "QtcSsh"

src/libs/utils/process_ctrlc_stub.qbs

 import qbs.base 1.0
-import "../../tools/QtcTool.qbs" as QtcTool
+import QtcTool
 
 QtcTool {
     name: "qtcreator_ctrlc_stub"

src/libs/utils/process_stub.qbs

 import qbs.base 1.0
-import "../../tools/QtcTool.qbs" as QtcTool
+import QtcTool
 
 QtcTool {
     name: "qtcreator_process_stub"

src/libs/utils/utils.qbs

 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "Utils"

src/libs/zeroconf/zeroconf.qbs

 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "zeroconf"

src/plugins/analyzerbase/analyzerbase.qbs

 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "AnalyzerBase"