qbs project files: Make use of new qbsSearchPaths property.

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

qbs/imports/QtcLibrary.qbs

@@ -1,5 +1,5 @@
 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 {

qbs/imports/QtcPlugin.qbs

@@ -1,6 +1,6 @@
 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

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "Aggregation"

src/libs/cplusplus/cplusplus.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "CPlusPlus"

src/libs/extensionsystem/extensionsystem.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "ExtensionSystem"

src/libs/glsl/glsl.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "GLSL"

src/libs/languageutils/languageutils.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "LanguageUtils"

src/libs/qmldebug/qmldebug.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "QmlDebug"

src/libs/qmleditorwidgets/qmleditorwidgets.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "QmlEditorWidgets"

src/libs/qmljs/qmljs.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "QmlJS"

src/libs/ssh/ssh.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "QtcSsh"

src/libs/utils/process_ctrlc_stub.qbs

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

src/libs/utils/process_stub.qbs

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

src/libs/utils/utils.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "Utils"

src/libs/zeroconf/zeroconf.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "zeroconf"

src/plugins/analyzerbase/analyzerbase.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "AnalyzerBase"

src/plugins/android/android.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Android"

src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "AutotoolsProjectManager"

src/plugins/baremetal/baremetal.qbs

@@ -1,6 +1,6 @@
 import qbs
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "BareMetal"

src/plugins/bazaar/bazaar.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Bazaar"

src/plugins/bineditor/bineditor.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "BinEditor"

src/plugins/bookmarks/bookmarks.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Bookmarks"

src/plugins/classview/classview.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "ClassView"

src/plugins/clearcase/clearcase.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "ClearCase"

src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "CMakeProjectManager"

src/plugins/coreplugin/coreplugin.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Core"

src/plugins/cpaster/cpaster.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "CodePaster"

src/plugins/cpaster/frontend/frontend.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../../../tools/QtcTool.qbs" as QtcTool
+import QtcTool
 
 QtcTool {
     name: "cpaster"

src/plugins/cppeditor/cppeditor.qbs

@@ -1,7 +1,7 @@
 import qbs.base 1.0
 import qbs.FileInfo
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "CppEditor"

src/plugins/cpptools/cpptools.qbs

@@ -1,7 +1,7 @@
 import qbs.base 1.0
 import qbs.FileInfo
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "CppTools"

src/plugins/cvs/cvs.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "CVS"

src/plugins/debugger/debugger.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Debugger"

src/plugins/debugger/ptracepreload.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../../libs/QtcLibrary.qbs" as QtcLibrary
+import QtcLibrary
 
 QtcLibrary {
     name: "ptracepreload"

src/plugins/designer/designer.qbs

@@ -1,7 +1,7 @@
 import qbs.base 1.0
 import qbs.FileInfo
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Designer"

src/plugins/diffeditor/diffeditor.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "DiffEditor"

src/plugins/fakevim/fakevim.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "FakeVim"

src/plugins/find/find.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Find"

src/plugins/genericprojectmanager/genericprojectmanager.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "GenericProjectManager"

src/plugins/git/git.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Git"

src/plugins/glsleditor/glsleditor.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "GLSLEditor"

src/plugins/helloworld/helloworld.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "HelloWorld"

src/plugins/help/help.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Help"

src/plugins/imageviewer/imageviewer.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "ImageViewer"

src/plugins/ios/ios.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Ios"

src/plugins/locator/locator.qbs

@@ -1,7 +1,7 @@
 import qbs.base 1.0
 import qbs.FileInfo
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Locator"

src/plugins/macros/macros.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Macros"

src/plugins/madde/madde.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Madde"

src/plugins/mercurial/mercurial.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Mercurial"

src/plugins/perforce/perforce.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Perforce"

src/plugins/projectexplorer/projectexplorer.qbs

@@ -1,7 +1,7 @@
 import qbs.base 1.0
 
-import "../../../qbs/functions.js" as QtcFunctions
+import QtcFunctions
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "ProjectExplorer"

src/plugins/pythoneditor/pythoneditor.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "PythonEditor"

src/plugins/qbsprojectmanager/qbsprojectmanager.qbs

@@ -1,7 +1,7 @@
 import qbs.base 1.0
 import qbs.FileInfo
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "QbsProjectManager"

src/plugins/qmldesigner/qmldesigner.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "QmlDesigner"

src/plugins/qmljseditor/qmljseditor.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "QmlJSEditor"

src/plugins/qmljstools/qmljstools.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "QmlJSTools"

src/plugins/qmlprofiler/qmlprofiler.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "QmlProfiler"

src/plugins/qmlprojectmanager/qmlprojectmanager.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "QmlProjectManager"

src/plugins/qnx/qnx.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Qnx"

src/plugins/qt4projectmanager/qt4projectmanager.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Qt4ProjectManager"

src/plugins/qtsupport/qtsupport.qbs

@@ -1,7 +1,7 @@
 import qbs.base 1.0
 
-import "../../../qbs/functions.js" as QtcFunctions
+import QtcFunctions
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "QtSupport"

src/plugins/remotelinux/remotelinux.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "RemoteLinux"

src/plugins/resourceeditor/resourceeditor.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "ResourceEditor"

src/plugins/subversion/subversion.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Subversion"

src/plugins/tasklist/tasklist.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "TaskList"

src/plugins/texteditor/texteditor.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "TextEditor"

src/plugins/todo/todo.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Todo"

src/plugins/updateinfo/updateinfo.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "UpdateInfo"

src/plugins/valgrind/valgrind.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Valgrind"

src/plugins/vcsbase/vcsbase.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "VcsBase"

src/plugins/welcome/welcome.qbs

@@ -1,6 +1,6 @@
 import qbs.base 1.0
 
-import "../QtcPlugin.qbs" as QtcPlugin
+import QtcPlugin
 
 QtcPlugin {
     name: "Welcome"

src/tools/3rdparty/iossim/iossim.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../../QtcTool.qbs" as QtcTool
+import QtcTool
 
 
 QtcTool {

src/tools/iostool/iostool.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcTool.qbs" as QtcTool
+import QtcTool
 
 QtcTool {
     name: "iostool"

src/tools/qtcdebugger/qtcdebugger.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcTool.qbs" as QtcTool
+import QtcTool
 
 QtcTool {
     name: "qtcdebugger"

src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcTool.qbs" as QtcTool
+import QtcTool
 
 QtcTool {
     name: "qtcreator_crash_handler"

src/tools/qtpromaker/qtpromaker.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcTool.qbs" as QtcTool
+import QtcTool
 
 QtcTool {
     name: "qtpromaker"

src/tools/sdktool/sdktool.qbs

@@ -1,5 +1,5 @@
 import qbs.base 1.0
-import "../QtcTool.qbs" as QtcTool
+import QtcTool
 
 QtcTool {
     name: "sdktool"

tests/auto/extensionsystem/plugin.qbs

@@ -1,7 +1,7 @@
 import qbs
 import qbs.FileInfo
 import "./copytransformer.qbs" as CopyTransformer
-import "../../../qbs/functions.js" as QtcFunctions
+import QtcFunctions
 
 DynamicLibrary {
     Depends { name: "Aggregation" }