diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-10 09:13:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-10 09:13:49 +0200 |
| commit | 9c84b7786cac7ea1cf1a8a61b503fca4b5553a49 (patch) | |
| tree | af018122dac633ad74f8e62bf260d1fb8339982a /src/src.pro | |
| parent | 18aa8390ce83b4aa9cabe5609b8f830f86e475e5 (diff) | |
| parent | 63a3b26b6b2dae88a44ad6a4917563b5331823d6 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/plugins/platforms/xcb/qxcbscreen.h
src/src.pro
Change-Id: I4e1981e69a1ddcbe4078ec6ab2a64b0da6a445de
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/src.pro b/src/src.pro index 832a3b6d82..8ff3ec4c1f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -70,7 +70,7 @@ src_winmain.depends = sub-corelib # just for the module .pri file src_corelib.subdir = $$PWD/corelib src_corelib.target = sub-corelib -src_corelib.depends = src_tools_moc src_tools_rcc +src_corelib.depends = src_tools_moc src_tools_rcc src_tools_tracegen src_xml.subdir = $$PWD/xml src_xml.target = sub-xml @@ -157,17 +157,12 @@ src_android.subdir = $$PWD/android src_3rdparty_freetype.depends += src_corelib } } -SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc +SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_tracegen qtConfig(regularexpression):pcre2 { SUBDIRS += src_3rdparty_pcre2 src_corelib.depends += src_3rdparty_pcre2 } -TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr -!force_bootstrap:if(qtConfig(lttng)|qtConfig(etw)) { - SUBDIRS += src_tools_tracegen - src_corelib.depends += src_tools_tracegen - TOOLS += src_tools_tracegen -} +TOOLS = src_tools_moc src_tools_rcc src_tools_tracegen src_tools_qlalr SUBDIRS += src_corelib src_tools_qlalr win32:SUBDIRS += src_winmain qtConfig(network) { |