summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2016-05-17 10:50:51 +0200
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2016-06-08 08:46:00 +0000
commita0f956f0509a68d7eaec718bed294661bca49996 (patch)
treef3ff7d1b0063f3ade80db26ca1b5b844a5c34167 /src/plugins
parentdb9437c2e83ec11befa855e4806ac7920d1a5800 (diff)
downloadqt-creator-a0f956f0509a68d7eaec718bed294661bca49996.tar.gz
qbs build: Introduce new module "qtc".
The qtc module gathers properties that used to live in the top-level project file. This is the first step towards making it possible to build plugins against an installed Qt Creator ("out of source build"). Change-Id: Ia1514cc9c888e80be01b308e908de48980fcbdb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/autotest/autotest.qbs8
-rw-r--r--src/plugins/clangcodemodel/clangcodemodel.qbs2
-rw-r--r--src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs2
-rw-r--r--src/plugins/coreplugin/coreplugin.qbs2
-rw-r--r--src/plugins/cppeditor/cppeditor.qbs2
-rw-r--r--src/plugins/cpptools/cpptools.qbs2
-rw-r--r--src/plugins/debugger/debugger.qbs4
-rw-r--r--src/plugins/designer/designer.qbs2
-rw-r--r--src/plugins/fakevim/fakevim.qbs2
-rw-r--r--src/plugins/genericprojectmanager/genericprojectmanager.qbs2
-rw-r--r--src/plugins/projectexplorer/projectexplorer.qbs4
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanager.qbs2
-rw-r--r--src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs2
-rw-r--r--src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs2
-rw-r--r--src/plugins/qmljstools/qmljstools.qbs2
-rw-r--r--src/plugins/qmlprofiler/qmlprofiler.qbs2
-rw-r--r--src/plugins/texteditor/texteditor.qbs2
-rw-r--r--src/plugins/vcsbase/vcsbase.qbs2
18 files changed, 23 insertions, 23 deletions
diff --git a/src/plugins/autotest/autotest.qbs b/src/plugins/autotest/autotest.qbs
index 3c38c14bf6..ae317af893 100644
--- a/src/plugins/autotest/autotest.qbs
+++ b/src/plugins/autotest/autotest.qbs
@@ -18,12 +18,12 @@ QtcPlugin {
Depends {
name: "QtSupport"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
}
Depends {
name: "Qt.test"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
}
Depends { name: "Qt.widgets" }
@@ -92,7 +92,7 @@ QtcPlugin {
Group {
name: "Test sources"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: [
"autotestunittests.cpp",
"autotestunittests.h",
@@ -108,6 +108,6 @@ QtcPlugin {
]
fileTags: []
qbs.install: true
- qbs.installDir: project.ide_data_path + "/templates/wizards/autotest"
+ qbs.installDir: qtc.ide_data_path + "/templates/wizards/autotest"
}
}
diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index 3109e20df4..d88f1d3e51 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -97,7 +97,7 @@ QtcPlugin {
Group {
name: "Tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
prefix: "test/"
files: [
"data/clangtestdata.qrc",
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs b/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs
index 4c446f5c63..b4a9258e72 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs
@@ -57,7 +57,7 @@ QtcPlugin {
Group {
name: "Unit tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: [
"clangstaticanalyzerunittests.cpp",
"clangstaticanalyzerunittests.h",
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index a2fcb520c4..f5fc28bd9b 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -193,7 +193,7 @@ QtcPlugin {
Group {
name: "Tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: [
"testdatadir.cpp",
"testdatadir.h",
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index bc2a8ea3a7..79105dc907 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -57,7 +57,7 @@ QtcPlugin {
Group {
name: "Tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: [
"cppdoxygen_test.cpp", "cppdoxygen_test.h",
"cppeditortestcase.cpp", "cppeditortestcase.h",
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index bd173c009c..1cfab29751 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -105,7 +105,7 @@ QtcPlugin {
Group {
name: "Tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: [
"cppcodegen_test.cpp",
"cppcompletion_test.cpp",
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 276e296782..2fcce2f42b 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -21,7 +21,7 @@ QtcPlugin {
Depends {
name: "Qt.test"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
}
pluginTestDepends: [
@@ -265,7 +265,7 @@ QtcPlugin {
Group {
name: "Unit tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: [
"debuggerunittests.qrc",
]
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index ae6a9a996b..fe903990cf 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -74,7 +74,7 @@ QtcPlugin {
Group {
name: "Tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: [ "gotoslot_test.cpp" ]
cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"'])
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index 73c5467081..e16041166c 100644
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/src/plugins/fakevim/fakevim.qbs
@@ -29,7 +29,7 @@ QtcPlugin {
Group {
name: "Tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: ["fakevim_test.cpp"]
}
}
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
index 0e4c2a86ea..fa734abd22 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
@@ -43,7 +43,7 @@ QtcPlugin {
Group {
name: "Tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: [ "genericprojectplugin_test.cpp" ]
cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"'])
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 508b99402e..15cf7ccd60 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -236,7 +236,7 @@ QtcPlugin {
Group {
name: "WindowsToolChains"
- condition: qbs.targetOS.contains("windows") || project.testsEnabled
+ condition: qbs.targetOS.contains("windows") || qtc.testsEnabled
files: [
"abstractmsvctoolchain.cpp",
"abstractmsvctoolchain.h",
@@ -253,7 +253,7 @@ QtcPlugin {
Group {
name: "Tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: ["outputparser_test.h", "outputparser_test.cpp"]
}
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
index 3314a7a12d..7b0434920e 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
@@ -7,7 +7,7 @@ QtcPlugin {
property var externalQbsIncludes: project.useExternalQbs
? [project.qbs_install_dir + "/include/qbs"] : []
property var externalQbsLibraryPaths: project.useExternalQbs
- ? [project.qbs_install_dir + '/' + project.libDirName] : []
+ ? [project.qbs_install_dir + '/' + qtc.libDirName] : []
property var externalQbsDynamicLibraries: {
var libs = []
if (!project.useExternalQbs)
diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs
index 5cb6f70911..74fd8b8991 100644
--- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs
+++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs
@@ -3,7 +3,7 @@ import qbs
QtcProduct {
name: "componentsplugin"
type: ["dynamiclibrary"]
- installDir: project.ide_plugin_path + '/' + installDirName
+ installDir: qtc.ide_plugin_path + '/' + installDirName
property string installDirName: qbs.targetOS.contains("osx") ? "QmlDesigner" : "qmldesigner"
Depends { name: "Core" }
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs
index 317e2101f7..18540ee72d 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs
@@ -3,7 +3,7 @@ import qbs
QtcProduct {
name: "qtquickplugin"
type: ["dynamiclibrary"]
- installDir: project.ide_plugin_path + '/' + installDirName
+ installDir: qtc.ide_plugin_path + '/' + installDirName
property string installDirName: qbs.targetOS.contains("osx") ? "QmlDesigner" : "qmldesigner"
cpp.defines: base.concat("QTQUICK_LIBRARY")
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index e5b44e6962..415c10c79d 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -49,7 +49,7 @@ QtcPlugin {
Group {
name: "Tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: ["qmljstools_test.cpp"]
}
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 32056fa83c..9010a0a719 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -74,7 +74,7 @@ QtcPlugin {
Group {
name: "Unit tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
prefix: "tests/"
files: [
"debugmessagesmodel_test.cpp", "debugmessagesmodel_test.h",
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 71d3a6e810..2ca0759a59 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -267,7 +267,7 @@ QtcPlugin {
Group {
name: "Tests"
- condition: project.testsEnabled
+ condition: qtc.testsEnabled
files: [
"texteditor_test.cpp",
]
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index 65e4d1bf41..a19269e857 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -82,5 +82,5 @@ QtcPlugin {
"wizard/vcsjsextension.h",
]
- cpp.defines: base.concat( testsEnabled ? ['SRC_DIR="' + project.ide_source_tree + '"'] : [] )
+ cpp.defines: base.concat(qtc.testsEnabled ? ['SRC_DIR="' + qtc.ide_source_tree + '"'] : [])
}