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/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 {
......
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]
}
}
......@@ -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",
......
import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "Aggregation"
......
import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "CPlusPlus"
......
import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "ExtensionSystem"
......
import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "GLSL"
......
import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "LanguageUtils"
......
import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "QmlDebug"
......
import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "QmlEditorWidgets"
......
import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "QmlJS"
......
import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "QtcSsh"
......
import qbs.base 1.0
import "../../tools/QtcTool.qbs" as QtcTool
import QtcTool
QtcTool {
name: "qtcreator_ctrlc_stub"
......
import qbs.base 1.0
import "../../tools/QtcTool.qbs" as QtcTool
import QtcTool
QtcTool {
name: "qtcreator_process_stub"
......
import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "Utils"
......
import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "zeroconf"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "AnalyzerBase"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Android"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "AutotoolsProjectManager"
......
import qbs
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "BareMetal"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Bazaar"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "BinEditor"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Bookmarks"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "ClassView"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "ClearCase"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "CMakeProjectManager"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Core"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "CodePaster"
......
import qbs.base 1.0
import "../../../tools/QtcTool.qbs" as QtcTool
import QtcTool
QtcTool {
name: "cpaster"
......
import qbs.base 1.0
import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "CppEditor"
......
import qbs.base 1.0
import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "CppTools"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "CVS"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Debugger"
......
import qbs.base 1.0
import "../../libs/QtcLibrary.qbs" as QtcLibrary
import QtcLibrary
QtcLibrary {
name: "ptracepreload"
......
import qbs.base 1.0
import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Designer"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "DiffEditor"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "FakeVim"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Find"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "GenericProjectManager"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Git"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "GLSLEditor"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "HelloWorld"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Help"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "ImageViewer"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Ios"
......
import qbs.base 1.0
import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Locator"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Macros"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Madde"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Mercurial"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Perforce"
......
import qbs.base 1.0
import "../../../qbs/functions.js" as QtcFunctions
import "../QtcPlugin.qbs" as QtcPlugin
import QtcFunctions
import QtcPlugin
QtcPlugin {
name: "ProjectExplorer"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "PythonEditor"
......
import qbs.base 1.0
import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "QbsProjectManager"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "QmlDesigner"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "QmlJSEditor"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "QmlJSTools"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "QmlProfiler"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "QmlProjectManager"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Qnx"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Qt4ProjectManager"
......
import qbs.base 1.0
import "../../../qbs/functions.js" as QtcFunctions
import "../QtcPlugin.qbs" as QtcPlugin
import QtcFunctions
import QtcPlugin
QtcPlugin {
name: "QtSupport"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "RemoteLinux"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "ResourceEditor"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Subversion"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "TaskList"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "TextEditor"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Todo"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "UpdateInfo"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Valgrind"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "VcsBase"
......
import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
import QtcPlugin
QtcPlugin {
name: "Welcome"
......
import qbs.base 1.0
import "../../QtcTool.qbs" as QtcTool
import QtcTool
QtcTool {
......
import qbs.base 1.0
import "../QtcTool.qbs" as QtcTool
import QtcTool
QtcTool {
name: "iostool"
......
import qbs.base 1.0
import "../QtcTool.qbs" as QtcTool
import QtcTool
QtcTool {
name: "qtcdebugger"
......
import qbs.base 1.0
import "../QtcTool.qbs" as QtcTool
import QtcTool
QtcTool {
name: "qtcreator_crash_handler"
......
import qbs.base 1.0
import "../QtcTool.qbs" as QtcTool
import QtcTool
QtcTool {
name: "qtpromaker"
......
import qbs.base 1.0
import "../QtcTool.qbs" as QtcTool
import QtcTool
QtcTool {
name: "sdktool"
......
import qbs
import qbs.FileInfo
import "./copytransformer.qbs" as CopyTransformer
import "../../../qbs/functions.js" as QtcFunctions
import QtcFunctions
DynamicLibrary {
Depends { name: "Aggregation" }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment