From c7973c7d352ac44181703b1c799d44af4f79549e Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Fri, 8 May 2020 23:30:52 +0200 Subject: [PATCH] qbs: update to the master branch and fix .pro files accordingly Change-Id: I22a28c9d359340ba1fada04ec4eee525df8ecfca Reviewed-by: Denis Shienkov Reviewed-by: Christian Kandeler --- src/shared/qbs | 2 +- src/shared/shared.pro | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/shared/qbs b/src/shared/qbs index 846fc574f38..62215625dde 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 846fc574f38395af24a9e60726372cb56075cff4 +Subproject commit 62215625dde98f6a6457159b4e3ef975d7014259 diff --git a/src/shared/shared.pro b/src/shared/shared.pro index ea76484dec6..b4c64a02fb4 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) {