diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-01 16:37:42 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:39:21 +0200 |
| commit | c7bf0448da8275f8835656ee37f2de72f22c8694 (patch) | |
| tree | 0c7f712bfa91a6c279db29f1b612f438d051176c /src | |
| parent | bcadd2ded2d86bf982564c816a6192c423ccb7e0 (diff) | |
detach src/src.pro and src/tools/tools.pro from qtbase.pro
they were included instead of being proper subdirs. this doesn't appear
to be necessary for anything at this point.
Change-Id: Ie57285df8e5ea7bd8883bcd42fa6ed62b8e1d54d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/src.pro | 18 | ||||
| -rw-r--r-- | src/tools/tools.pro | 3 |
2 files changed, 7 insertions, 14 deletions
diff --git a/src/src.pro b/src/src.pro index dc3e850d8f..f1ea4bbc94 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,9 +1,8 @@ TEMPLATE = subdirs # this order is important -unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain -!wince*:include(tools/tools.pro) +!wince*:SRC_SUBDIRS += src_tools SRC_SUBDIRS += src_corelib SRC_SUBDIRS += src_network src_sql src_gui src_xml src_testlib src_platformsupport src_widgets !wince*:SRC_SUBDIRS += src_printsupport @@ -16,6 +15,8 @@ contains(QT_CONFIG, no-gui): SRC_SUBDIRS -= src_gui contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl SRC_SUBDIRS += src_plugins +src_tools.subdir = $$PWD/tools +src_tools.target = sub-tools src_winmain.subdir = $$PWD/winmain src_winmain.target = sub-winmain src_corelib.subdir = $$PWD/corelib @@ -50,11 +51,11 @@ src_concurrent.target = sub-concurrent #CONFIG += ordered !wince*:!ordered { - src_corelib.depends = src_tools_moc src_tools_rcc + src_corelib.depends = src_tools src_gui.depends = src_corelib src_printsupport.depends = src_corelib src_gui src_widgets src_platformsupport.depends = src_corelib src_gui src_network - src_widgets.depends = src_corelib src_gui src_tools_uic + src_widgets.depends = src_corelib src_gui src_xml.depends = src_corelib src_concurrent.depends = src_corelib src_dbus.depends = src_corelib @@ -67,11 +68,4 @@ src_concurrent.target = sub-concurrent contains(QT_CONFIG, no-widgets): SRC_SUBDIRS -= src_opengl src_widgets src_printsupport -# This creates a sub-src rule -sub_src_target.CONFIG = recursive -sub_src_target.recurse = $$TOOLS_SUBDIRS $$SRC_SUBDIRS -sub_src_target.target = sub-src -sub_src_target.recurse_target = -QMAKE_EXTRA_TARGETS += sub_src_target - -SUBDIRS += $$SRC_SUBDIRS +SUBDIRS = $$SRC_SUBDIRS diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 875203b62c..bd8896259a 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -33,5 +33,4 @@ contains(QT_CONFIG, dbus) { } } -SUBDIRS = $$TOOLS_SUBDIRS $$SUBDIRS -isEqual(TARGET,tools): SUBDIRS += $$SRC_SUBDIRS +SUBDIRS = $$TOOLS_SUBDIRS |