From 7bf21ea94f800b4540a8d720f2f0b4341e4b5652 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 6 Feb 2013 22:12:19 +0200
Subject: [PATCH] Add qbs submodule
Change-Id: I24952ea89519cf37c021d79f480c1ae907789161
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
.gitmodules | 3 +++
qtcreator.qbs | 2 +-
src/libs/libs.pro | 6 ++++++
src/plugins/plugins.pro | 8 +-------
src/plugins/qbsprojectmanager/qbsprojectmanager.pro | 7 ++-----
src/shared/qbs | 1 +
6 files changed, 14 insertions(+), 13 deletions(-)
create mode 100644 .gitmodules
create mode 160000 src/shared/qbs
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000000..3abc8f844da
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "qbs"]
+ path = src/shared/qbs
+ url = ../../qt-labs/qbs.git
diff --git a/qtcreator.qbs b/qtcreator.qbs
index b3356c921ec..6a7a5f0fbf4 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+Import qbs.base 1.0
import qbs.fileinfo 1.0 as FileInfo
import "qbs/defaults.js" as Defaults
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index 9a1da2d4ebe..4598fd4c8bb 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -16,6 +16,12 @@ SUBDIRS = \
qtcomponents/styleitem \
ssh \
zeroconf
+
+exists(../shared/qbs/qbs.pro):SUBDIRS += \
+ ../shared/qbs/src/lib \
+ ../shared/qbs/src/plugins \
+ ../shared/qbs/static.pro
+
win32:SUBDIRS += utils/process_ctrlc_stub.pro
# Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 987ca8d4f0c..2a8628ceeb9 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -48,13 +48,7 @@ SUBDIRS = plugin_coreplugin \
plugin_todo \
plugin_qnx
-# Look for qbs in the environment...
-isEmpty(QBS_SOURCE_DIR): QBS_SOURCE_DIR = $$(QBS_SOURCE_DIR)
-isEmpty(QBS_BUILD_DIR): QBS_BUILD_DIR = $$(QBS_BUILD_DIR)
-
-!isEmpty(QBS_SOURCE_DIR):!isEmpty(QBS_BUILD_DIR) {
- SUBDIRS += plugin_qbsprojectmanager
-}
+exists(../shared/qbs/qbs.pro):SUBDIRS += plugin_qbsprojectmanager
isEmpty(IDE_PACKAGE_MODE) {
SUBDIRS += plugin_helloworld \
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
index d179d8aa36b..5cbbc02d7ba 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
@@ -6,16 +6,14 @@ include(../../libs/qmljs/qmljs.pri)
include(qbsprojectmanager_dependencies.pri)
# Look for qbs in the environment (again)
-isEmpty(QBS_SOURCE_DIR): QBS_SOURCE_DIR = $$(QBS_SOURCE_DIR)
-isEmpty(QBS_BUILD_DIR): QBS_BUILD_DIR = $$(QBS_BUILD_DIR)
+QBS_SOURCE_DIR = $$PWD/../../shared/qbs
+QBS_BUILD_DIR = $$IDE_BUILD_TREE/src/shared/qbs
QBSLIBDIR = $$QBS_BUILD_DIR/lib
include($$QBS_SOURCE_DIR/src/lib/use.pri)
linux-*:QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$QBSLIBDIR\'
macx:QMAKE_LFLAGS += -Wl,-rpath,$$QBSLIBDIR
-QBS_SOURCE_DIR_FWD_SLASHES = $$replace(QBS_SOURCE_DIR, \\\\, /)
-DEFINES += QBS_SOURCE_DIR=\\\"$$QBS_SOURCE_DIR_FWD_SLASHES\\\"
QBS_BUILD_DIR_FWD_SLASHES = $$replace(QBS_BUILD_DIR, \\\\, /)
DEFINES += QBS_BUILD_DIR=\\\"$$QBS_BUILD_DIR_FWD_SLASHES\\\"
DEFINES += \
@@ -56,4 +54,3 @@ FORMS = \
qbsbuildstepconfigwidget.ui \
qbscleanstepconfigwidget.ui \
qbsstepconfigwidget.ui
-
diff --git a/src/shared/qbs b/src/shared/qbs
new file mode 160000
index 00000000000..35f153400ef
--- /dev/null
+++ b/src/shared/qbs
@@ -0,0 +1 @@
+Subproject commit 35f153400efc3303ac9f9c54506c6bbc5bc5c988
--
GitLab