diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-08 20:31:05 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 23:11:47 +0100 |
| commit | 29daf4ddf9151bd897791b7634a44ef64417bec6 (patch) | |
| tree | d453bd1aa73c8a28d9cb7b6b35c2d3fc6ac96dda /src/tools | |
| parent | 0d505b983af91ea7eeed9f3098f0d0603b3ea472 (diff) | |
melt src/tools/tools.pro into src/src.pro
this is done mainly to resolve spurious dependencies, in preparation
for making some tools not bootstrapped in native builds.
as a nice side effect, there is even more parallelization possible now.
Change-Id: I779cf0059c98c65aba8510bf3d24fdab4eeaa863
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tools.pro | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/tools/tools.pro b/src/tools/tools.pro deleted file mode 100644 index 1eba102c20..0000000000 --- a/src/tools/tools.pro +++ /dev/null @@ -1,36 +0,0 @@ -TEMPLATE = subdirs - -TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc -contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml -!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic -# Set subdir and respective target name -src_tools_bootstrap.subdir = bootstrap -src_tools_bootstrap.target = sub-tools-bootstrap -src_tools_moc.subdir = moc -src_tools_moc.target = sub-moc -src_tools_rcc.subdir = rcc -src_tools_rcc.target = sub-rcc -src_tools_uic.subdir = uic -src_tools_uic.target = sub-uic -src_tools_qdoc.subdir = qdoc -src_tools_qdoc.target = sub-qdoc -contains(QT_CONFIG, dbus) { - src_tools_qdbusxml2cpp.subdir = qdbusxml2cpp - src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp - src_tools_qdbuscpp2xml.subdir = qdbuscpp2xml - src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml -} - -!ordered { - # Set dependencies for each subdir - src_tools_moc.depends = src_tools_bootstrap - src_tools_rcc.depends = src_tools_bootstrap - src_tools_uic.depends = src_tools_bootstrap - src_tools_qdoc.depends = src_tools_bootstrap - contains(QT_CONFIG, dbus) { - src_tools_qdbusxml2cpp.depends = src_tools_bootstrap - src_tools_qdbuscpp2xml.depends = src_tools_bootstrap - } -} - -SUBDIRS = $$TOOLS_SUBDIRS |