summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-05 08:13:54 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-05 09:04:58 (GMT)
commit5d7f0a4dc479faee5dccae7ba826e96e7528607a (patch)
tree738e24e76a9e838f2732b85533b3a5180ce0a4d4 /src/src.pro
parentc08e708037d33271825ce6a6a1ac640e96b70c36 (diff)
downloadQt-5d7f0a4dc479faee5dccae7ba826e96e7528607a.zip
Qt-5d7f0a4dc479faee5dccae7ba826e96e7528607a.tar.gz
Qt-5d7f0a4dc479faee5dccae7ba826e96e7528607a.tar.bz2
Ensure IDC and UIC3 dependencies are correct
After the refactoring to src/tools/tools.pro the dependencies for IDC and UIC3 ended up being incorrect, due to the eval rules later in that file. This patch adds IDC and UIC3 to SRC_SUBDIRS after Qt3Support, and before ActiveQt, so the dependencies remain correct as before the refactoring. The added condition of src/tools/tools.pro ensures that we add the tools to the Makefile in src/tools, should we decide to generate it, and compile from there. Reviewed-by: Jason McDonald
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro
index 77605a8..28dc5be 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -8,9 +8,9 @@ wince*:{
} else:symbian {
SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib src_s60installs
} else {
- include(tools/tools.pro)
SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_testlib
!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
+ include(tools/tools.pro)
contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
}
win32:SRC_SUBDIRS += src_activeqt
@@ -93,6 +93,8 @@ src_webkit.target = sub-webkit
src_sql.depends = src_corelib
src_testlib.depends = src_corelib
src_qt3support.depends = src_gui src_xml src_network src_sql
+ src_tools_idc.depends = src_corelib # target defined in tools.pro
+ src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro
src_phonon.depends = src_gui
src_multimedia.depends = src_gui
src_tools_activeqt.depends = src_tools_idc src_gui