diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-06-11 08:00:56 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-06-11 08:08:01 (GMT) |
commit | 801bb087f8fc2f911bddc42441d450b876a09d8b (patch) | |
tree | 55008b0fe6b6561c2ef507d2c571b0f5e6b2b524 | |
parent | 2b3c318c102f3c1304968e6b111b1ac96764c115 (diff) | |
download | Qt-801bb087f8fc2f911bddc42441d450b876a09d8b.zip Qt-801bb087f8fc2f911bddc42441d450b876a09d8b.tar.gz Qt-801bb087f8fc2f911bddc42441d450b876a09d8b.tar.bz2 |
Fix recursive targets for src.pro
Dependencies to tools moc, rcc and uic on some subdirs break recursive
targets like 'make sis' for symbian-abld and symbian-sbsv2 builds.
There is no need to have any subdir dependencies for above mkspecs as
those builds are always ordered anyway.
Task-number: QTBUG-5312
Reviewed-by: Janne Koskinen
-rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 5436c4a..3ac69be 100644 --- a/src/src.pro +++ b/src/src.pro @@ -84,7 +84,7 @@ src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative src_declarative.target = sub-declarative #CONFIG += ordered -!wince*:!ordered { +!wince*:!ordered:!symbian-abld:!symbian-sbsv2 { src_corelib.depends = src_tools_moc src_tools_rcc src_gui.depends = src_corelib src_tools_uic embedded: src_gui.depends += src_network |