aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-05-08 23:30:52 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2020-05-11 11:20:26 +0000
commitc7973c7d352ac44181703b1c799d44af4f79549e (patch)
tree32e5c4bcefe1a517e2b9402dd76b0dfae7b5a414 /src/shared
parent20ef5c6de33e944f22173267ccd39f7629e057d9 (diff)
qbs: update to the master branch and fix .pro files accordingly
Change-Id: I22a28c9d359340ba1fada04ec4eee525df8ecfca Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/shared')
m---------src/shared/qbs0
-rw-r--r--src/shared/shared.pro5
2 files changed, 4 insertions, 1 deletions
diff --git a/src/shared/qbs b/src/shared/qbs
-Subproject 846fc574f38395af24a9e60726372cb56075cff
+Subproject 62215625dde98f6a6457159b4e3ef975d701425
diff --git a/src/shared/shared.pro b/src/shared/shared.pro
index ea76484dec..b4c64a02fb 100644
--- a/src/shared/shared.pro
+++ b/src/shared/shared.pro
@@ -4,6 +4,7 @@ QBS_DIRS = \
qbscorelib \
qbsapps \
qbslibexec \
+ qbsmsbuildlib \
qbsplugins \
qbsstatic
@@ -12,8 +13,10 @@ qbsapps.subdir = qbs/src/app
qbsapps.depends = qbscorelib
qbslibexec.subdir = qbs/src/libexec
qbslibexec.depends = qbscorelib
+qbsmsbuildlib.subdir = qbs/src/lib/msbuild
+qbsmsbuildlib.depends = qbscorelib
qbsplugins.subdir = qbs/src/plugins
-qbsplugins.depends = qbscorelib
+qbsplugins.depends = qbscorelib qbsmsbuildlib
qbsstatic.file = qbs/static.pro
exists(qbs/qbs.pro) {