summaryrefslogtreecommitdiffstats
path: root/src/tools/tools.pro
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-05 08:13:54 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-05 09:04:58 (GMT)
commit5d7f0a4dc479faee5dccae7ba826e96e7528607a (patch)
tree738e24e76a9e838f2732b85533b3a5180ce0a4d4 /src/tools/tools.pro
parentc08e708037d33271825ce6a6a1ac640e96b70c36 (diff)
downloadQt-5d7f0a4dc479faee5dccae7ba826e96e7528607a.zip
Qt-5d7f0a4dc479faee5dccae7ba826e96e7528607a.tar.gz
Qt-5d7f0a4dc479faee5dccae7ba826e96e7528607a.tar.bz2
Ensure IDC and UIC3 dependencies are correct
After the refactoring to src/tools/tools.pro the dependencies for IDC and UIC3 ended up being incorrect, due to the eval rules later in that file. This patch adds IDC and UIC3 to SRC_SUBDIRS after Qt3Support, and before ActiveQt, so the dependencies remain correct as before the refactoring. The added condition of src/tools/tools.pro ensures that we add the tools to the Makefile in src/tools, should we decide to generate it, and compile from there. Reviewed-by: Jason McDonald
Diffstat (limited to 'src/tools/tools.pro')
-rw-r--r--src/tools/tools.pro9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 798bd0b..7c8fb47 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -2,8 +2,8 @@ TEMPLATE = subdirs
TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic
!cross_compile {
- contains(QT_CONFIG, qt3support): TOOLS_SUBDIRS += src_tools_uic3
- win32:!wince*: TOOLS_SUBDIRS += src_tools_idc
+ contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
+ win32:!wince*: SRC_SUBDIRS += src_tools_idc
}
# Set subdir and respective target name
@@ -24,8 +24,6 @@ src_tools_idc.target = sub-idc
src_tools_moc.depends = src_tools_bootstrap
src_tools_rcc.depends = src_tools_bootstrap
src_tools_uic.depends = src_tools_bootstrap
-src_tools_idc.depends = src_corelib # defined in parent pro, in any, if not ignored
-src_tools_uic3.depends = src_qt3support src_xml # defined in parent pro, in any, if not ignored
# Special handling, depending on type of project, if it used debug/release or only has one configuration
EXTRA_DEBUG_TARGETS =
@@ -68,4 +66,5 @@ EXTRA_RELEASE_TARGETS =
}
}
-SUBDIRS += $$TOOLS_SUBDIRS
+SUBDIRS = $$TOOLS_SUBDIRS $$SUBDIRS
+isEqual(TARGET,tools): SUBDIRS += $$SRC_SUBDIRS