Commit f1da03c7 authored by Christian Kandeler's avatar Christian Kandeler Committed by Joerg Bornemann

qbs project files: Make use of new qbsSearchPaths property.

Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent b60bbbae
import qbs.base 1.0 import qbs.base 1.0
import "../../qbs/functions.js" as QtcFunctions import QtcFunctions
DynamicLibrary { DynamicLibrary {
Depends { name: "cpp" } Depends { name: "cpp" }
...@@ -22,11 +22,12 @@ DynamicLibrary { ...@@ -22,11 +22,12 @@ DynamicLibrary {
cpp.rpaths: qbs.targetOS.contains("osx") cpp.rpaths: qbs.targetOS.contains("osx")
? ["@loader_path/..", "@executable_path/.."] ? ["@loader_path/..", "@executable_path/.."]
: ["$ORIGIN", "$ORIGIN/.."] : ["$ORIGIN", "$ORIGIN/.."]
cpp.includePaths: [path] property string libIncludeBase: ".." // #include <lib/header.h>
cpp.includePaths: [libIncludeBase]
Export { Export {
Depends { name: "cpp" } Depends { name: "cpp" }
cpp.includePaths: [path] cpp.includePaths: [libIncludeBase]
} }
Group { Group {
......
import qbs.base 1.0 import qbs.base 1.0
import qbs.FileInfo import qbs.FileInfo
import "../../qbs/functions.js" as QtcFunctions import QtcFunctions
Product { Product {
type: ["dynamiclibrary", "pluginSpec"] type: ["dynamiclibrary", "pluginSpec"]
...@@ -33,7 +33,9 @@ Product { ...@@ -33,7 +33,9 @@ Product {
else if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc")) else if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc"))
return ["/INCREMENTAL:NO"] // Speed up startup time when debugging with cdb 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 { Group {
name: "PluginSpec" name: "PluginSpec"
...@@ -55,6 +57,6 @@ Product { ...@@ -55,6 +57,6 @@ Product {
Export { Export {
Depends { name: "ExtensionSystem" } Depends { name: "ExtensionSystem" }
Depends { name: "cpp" } Depends { name: "cpp" }
cpp.includePaths: [path] cpp.includePaths: [pluginIncludeBase]
} }
} }
...@@ -52,7 +52,7 @@ Project { ...@@ -52,7 +52,7 @@ Project {
"QT_NO_CAST_TO_ASCII", "QT_NO_CAST_TO_ASCII",
"QT_NO_CAST_FROM_ASCII" "QT_NO_CAST_FROM_ASCII"
].concat(testsEnabled ? ["WITH_TESTS"] : []) ].concat(testsEnabled ? ["WITH_TESTS"] : [])
moduleSearchPaths: "qbs" qbsSearchPaths: "qbs"
references: [ references: [
"src/src.qbs", "src/src.qbs",
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "Aggregation" name: "Aggregation"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "CPlusPlus" name: "CPlusPlus"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "ExtensionSystem" name: "ExtensionSystem"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "GLSL" name: "GLSL"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "LanguageUtils" name: "LanguageUtils"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "QmlDebug" name: "QmlDebug"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "QmlEditorWidgets" name: "QmlEditorWidgets"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "QmlJS" name: "QmlJS"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "QtcSsh" name: "QtcSsh"
......
import qbs.base 1.0 import qbs.base 1.0
import "../../tools/QtcTool.qbs" as QtcTool import QtcTool
QtcTool { QtcTool {
name: "qtcreator_ctrlc_stub" name: "qtcreator_ctrlc_stub"
......
import qbs.base 1.0 import qbs.base 1.0
import "../../tools/QtcTool.qbs" as QtcTool import QtcTool
QtcTool { QtcTool {
name: "qtcreator_process_stub" name: "qtcreator_process_stub"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "Utils" name: "Utils"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "zeroconf" name: "zeroconf"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "AnalyzerBase" name: "AnalyzerBase"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Android" name: "Android"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "AutotoolsProjectManager" name: "AutotoolsProjectManager"
......
import qbs import qbs
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "BareMetal" name: "BareMetal"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Bazaar" name: "Bazaar"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "BinEditor" name: "BinEditor"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Bookmarks" name: "Bookmarks"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "ClassView" name: "ClassView"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "ClearCase" name: "ClearCase"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "CMakeProjectManager" name: "CMakeProjectManager"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Core" name: "Core"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "CodePaster" name: "CodePaster"
......
import qbs.base 1.0 import qbs.base 1.0
import "../../../tools/QtcTool.qbs" as QtcTool import QtcTool
QtcTool { QtcTool {
name: "cpaster" name: "cpaster"
......
import qbs.base 1.0 import qbs.base 1.0
import qbs.FileInfo import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "CppEditor" name: "CppEditor"
......
import qbs.base 1.0 import qbs.base 1.0
import qbs.FileInfo import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "CppTools" name: "CppTools"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "CVS" name: "CVS"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Debugger" name: "Debugger"
......
import qbs.base 1.0 import qbs.base 1.0
import "../../libs/QtcLibrary.qbs" as QtcLibrary import QtcLibrary
QtcLibrary { QtcLibrary {
name: "ptracepreload" name: "ptracepreload"
......
import qbs.base 1.0 import qbs.base 1.0
import qbs.FileInfo import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Designer" name: "Designer"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "DiffEditor" name: "DiffEditor"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "FakeVim" name: "FakeVim"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Find" name: "Find"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "GenericProjectManager" name: "GenericProjectManager"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Git" name: "Git"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "GLSLEditor" name: "GLSLEditor"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "HelloWorld" name: "HelloWorld"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Help" name: "Help"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "ImageViewer" name: "ImageViewer"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Ios" name: "Ios"
......
import qbs.base 1.0 import qbs.base 1.0
import qbs.FileInfo import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Locator" name: "Locator"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Macros" name: "Macros"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Madde" name: "Madde"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {
name: "Mercurial" name: "Mercurial"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin import QtcPlugin
QtcPlugin { QtcPlugin {