From 989cada8cc6c4f12e30c28bde3edac8a3833680f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 22 Jun 2012 19:52:41 +0200 Subject: don't compile the host tools for wince already in configure qmake can now produce proper mixed-target projects Change-Id: I797f055f6e1487b9aefb75eee91d6c2cc4e6e56e Reviewed-by: Andreas Holzammer Reviewed-by: Oswald Buddenhagen --- src/src.pro | 7 ++----- src/tools/tools.pro | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/src.pro b/src/src.pro index a474b795af..986c955be8 100644 --- a/src/src.pro +++ b/src/src.pro @@ -9,6 +9,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 src_xml.subdir = $$PWD/xml src_xml.target = sub-xml @@ -59,11 +60,7 @@ src_plugins.target = sub-plugins src_plugins.depends = src_sql src_xml src_network src_platformsupport # this order is important -!wince* { - SUBDIRS += src_tools - src_corelib.depends += src_tools -} -SUBDIRS += src_corelib +SUBDIRS += src_tools src_corelib win32:SUBDIRS += src_winmain SUBDIRS += src_network src_sql src_xml src_testlib contains(QT_CONFIG, dbus) { diff --git a/src/tools/tools.pro b/src/tools/tools.pro index bd8896259a..d626077a73 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -21,7 +21,7 @@ contains(QT_CONFIG, dbus) { src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml } -!wince*:!ordered { +!ordered { # Set dependencies for each subdir src_tools_moc.depends = src_tools_bootstrap src_tools_rcc.depends = src_tools_bootstrap -- cgit v1.2.3