diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-05-24 11:01:33 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-05-24 11:01:33 +0200 |
| commit | 82895982ec31b2c889393e7f386c25d668df6c5e (patch) | |
| tree | 17435b41010ad1f7a130296e68c5d77522372036 | |
| parent | 52c987cc30789b7e8eb979678659a7783fc72a54 (diff) | |
Fix build from scratch on Windows.
idc needs corelib (should be moved to ActiveQt later).
| -rw-r--r-- | src/src.pro | 7 | ||||
| -rw-r--r-- | src/tools/tools.pro | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/src.pro b/src/src.pro index 4e77b88354..4f6c1c80f8 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,7 +5,12 @@ unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain symbian:SRC_SUBDIRS += src_s60main !wince*:!symbian-abld:!symbian-sbsv2:include(tools/tools.pro) -SRC_SUBDIRS += src_corelib src_network src_sql src_gui src_xml src_uitools src_widgets src_testlib +SRC_SUBDIRS += src_corelib +# TODO: Move idc to ActiveQt +!cross_compile { + win32:!wince*: SRC_SUBDIRS += src_tools_idc +} +SRC_SUBDIRS += src_network src_sql src_gui src_xml src_uitools src_widgets src_testlib nacl: SRC_SUBDIRS -= src_network src_testlib !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus contains(QT_CONFIG, no-gui): SRC_SUBDIRS -= src_gui diff --git a/src/tools/tools.pro b/src/tools/tools.pro index ca42da6edf..47e216efc9 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -2,10 +2,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 { - win32:!wince*: SRC_SUBDIRS += src_tools_idc -} - # Set subdir and respective target name src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap src_tools_bootstrap.target = sub-tools-bootstrap |