Add qbs submodule

Change-Id: I24952ea89519cf37c021d79f480c1ae907789161
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "qbs"]
+	path = src/shared/qbs
+	url = ../../qt-labs/qbs.git

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
 

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.    

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 \

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
-