From 791d791f2ca80dc623e6dac78c9f469e442516c3 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 5 Feb 2019 12:49:35 +0100 Subject: [PATCH] Make deployqt target recursive So perfparser's deploy target is triggered too Change-Id: I131a23b46127130967767fd7fee629ac5a97b17a Reviewed-by: Ulf Hermann --- qtcreator.pro | 3 +++ src/app/app.pro | 2 ++ src/libs/libs.pro | 2 ++ src/plugins/plugins.pro | 2 ++ src/shared/shared.pro | 28 ++++++++++++++++++++++++++++ src/src.pro | 32 ++++++-------------------------- src/tools/perfparser | 2 +- src/tools/tools.pro | 5 +++++ 8 files changed, 49 insertions(+), 27 deletions(-) create mode 100644 src/shared/shared.pro diff --git a/qtcreator.pro b/qtcreator.pro index 214740353a3..98a897aa2b0 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -150,4 +150,7 @@ win32 { bindist_installer.commands ~= s,/,\\\\,g } +deployqt.CONFIG += recursive +deployqt.recurse = src + QMAKE_EXTRA_TARGETS += deployqt bindist bindist_installer bindist_debug diff --git a/src/app/app.pro b/src/app/app.pro index 08af263b476..89b9554a9ff 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -52,3 +52,5 @@ DISTFILES += qtcreator.rc \ QMAKE_SUBSTITUTES += $$PWD/app_version.h.in CONFIG += no_batch + +QMAKE_EXTRA_TARGETS += deployqt # dummy diff --git a/src/libs/libs.pro b/src/libs/libs.pro index 1ffb3bc9a49..8bc99461a71 100644 --- a/src/libs/libs.pro +++ b/src/libs/libs.pro @@ -48,3 +48,5 @@ win32: isEmpty(QTC_SKIP_CDBEXT) { message("environment variable pointing to your CDB installation.") } } + +QMAKE_EXTRA_TARGETS += deployqt # dummy diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index e935e7b5e8b..9efcf77bf11 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -133,3 +133,5 @@ for(p, SUBDIRS) { linux-* { SUBDIRS += debugger/ptracepreload.pro } + +QMAKE_EXTRA_TARGETS += deployqt # dummy diff --git a/src/shared/shared.pro b/src/shared/shared.pro new file mode 100644 index 00000000000..e75970c0fb3 --- /dev/null +++ b/src/shared/shared.pro @@ -0,0 +1,28 @@ +TEMPLATE = subdirs + +QBS_DIRS = \ + qbscorelib \ + qbsqtprofilesetup \ + qbsapps \ + qbslibexec \ + qbsplugins \ + qbsstatic + +qbscorelib.subdir = qbs/src/lib/corelib +qbsqtprofilesetup.subdir = qbs/src/lib/qtprofilesetup +qbsqtprofilesetup.depends = qbscorelib +qbsapps.subdir = qbs/src/app +qbsapps.depends = qbsqtprofilesetup +qbslibexec.subdir = qbs/src/libexec +qbslibexec.depends = qbscorelib +qbsplugins.subdir = qbs/src/plugins +qbsplugins.depends = qbscorelib +qbsstatic.file = qbs/static.pro + +exists(qbs/qbs.pro) { + isEmpty(QBS_INSTALL_DIR):QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR) + isEmpty(QBS_INSTALL_DIR):SUBDIRS += $$QBS_DIRS +} +TR_EXCLUDE = qbs + +QMAKE_EXTRA_TARGETS += deployqt # dummy diff --git a/src/src.pro b/src/src.pro index 496c500dbdd..4380ec271d4 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,36 +1,16 @@ -include(../qtcreator.pri) - TEMPLATE = subdirs CONFIG += ordered -QBS_DIRS = \ - qbscorelib \ - qbsqtprofilesetup \ - qbsapps \ - qbslibexec \ - qbsplugins \ - qbsstatic - -qbscorelib.subdir = shared/qbs/src/lib/corelib -qbsqtprofilesetup.subdir = shared/qbs/src/lib/qtprofilesetup -qbsqtprofilesetup.depends = qbscorelib -qbsapps.subdir = shared/qbs/src/app -qbsapps.depends = qbsqtprofilesetup -qbslibexec.subdir = shared/qbs/src/libexec -qbslibexec.depends = qbscorelib -qbsplugins.subdir = shared/qbs/src/plugins -qbsstatic.file = shared/qbs/static.pro - -exists(shared/qbs/qbs.pro) { - isEmpty(QBS_INSTALL_DIR):QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR) - isEmpty(QBS_INSTALL_DIR):SUBDIRS += $$QBS_DIRS -} -TR_EXCLUDE = shared/qbs - SUBDIRS += \ + shared \ libs \ app \ plugins \ tools \ share/qtcreator/data.pro \ share/3rdparty/data.pro + +# delegate deployqt target +deployqt.CONFIG += recursive +deployqt.recurse = shared libs app plugins tools +QMAKE_EXTRA_TARGETS += deployqt diff --git a/src/tools/perfparser b/src/tools/perfparser index 15a4e2d8dcd..5222205d9ac 160000 --- a/src/tools/perfparser +++ b/src/tools/perfparser @@ -1 +1 @@ -Subproject commit 15a4e2d8dcde52994a85361154c44e7810779d7a +Subproject commit 5222205d9acca1107507bfdeebaab194157012e0 diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 07cc2c2114a..61a8d07cc59 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -81,3 +81,8 @@ exists(perfparser/perfparser.pro) { } OTHER_FILES += tools.qbs + +# delegate deployqt target +deployqt.CONFIG += recursive +deployqt.recurse = perfparser +QMAKE_EXTRA_TARGETS += deployqt