diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2010-11-08 20:09:10 -0600 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:44 +0200 |
| commit | f6d0b717001c17aa985c3159ad2df8cc40fbbc02 (patch) | |
| tree | 8ed945156e00673fffa79c02b0717d3cea224108 /src/tools/tools.pro | |
| parent | 7e5b390746fe4e0ffbb11f9d8b4449013eb7f4ba (diff) | |
Some changes for qtbase
Diffstat (limited to 'src/tools/tools.pro')
| -rw-r--r-- | src/tools/tools.pro | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 4736d09cbe..ca42da6edf 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -3,7 +3,6 @@ TEMPLATE = subdirs TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc !contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic !cross_compile { - contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3 win32:!wince*: SRC_SUBDIRS += src_tools_idc } @@ -16,8 +15,6 @@ src_tools_rcc.subdir = $$QT_SOURCE_TREE/src/tools/rcc src_tools_rcc.target = sub-rcc src_tools_uic.subdir = $$QT_SOURCE_TREE/src/tools/uic src_tools_uic.target = sub-uic -src_tools_uic3.subdir = $$QT_SOURCE_TREE/src/tools/uic3 -src_tools_uic3.target = sub-uic3 src_tools_idc.subdir = $$QT_SOURCE_TREE/src/tools/idc src_tools_idc.target = sub-idc @@ -43,7 +40,7 @@ EXTRA_RELEASE_TARGETS = subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP) subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP) SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE)) - !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs) | isEqual(subname, src_tools_idc) | isEqual(subname, src_tools_uic3)):!separate_debug_info { + !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs) | isEqual(subname, src_tools_idc)):!separate_debug_info { #debug debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug) |