diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-04-09 17:42:47 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-04-12 09:38:49 (GMT) |
| commit | 05d2c47c4266808b9683b78aa5082dbda0c02871 (patch) | |
| tree | b620b8cf8d2acc636c7c408308fc1e40b6bc38f2 /src/src.pro | |
| parent | f96470898c11ac2dfc0111925cc1843348e72f19 (diff) | |
| download | Qt-05d2c47c4266808b9683b78aa5082dbda0c02871.zip Qt-05d2c47c4266808b9683b78aa5082dbda0c02871.tar.gz Qt-05d2c47c4266808b9683b78aa5082dbda0c02871.tar.bz2 | |
fix build from top level
even more fallout from MR 543. qt3support needs to be added after qtgui,
as a build from top level is ordered, not dependency based.
as i was at it, i cleaned up the platform conditionals some more.
Reviewed-by: joerg
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/src.pro b/src/src.pro index ea65e25..70beb46 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,22 +3,15 @@ TEMPLATE = subdirs # this order is important unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain -wince*:{ - SRC_SUBDIRS += src_corelib src_xml src_sql src_network src_testlib -} else:symbian { - SRC_SUBDIRS += src_s60main src_corelib src_xml src_network src_sql src_testlib - !symbian-abld:!symbian-sbsv2 { - include(tools/tools.pro) - } -} else { - SRC_SUBDIRS += src_corelib src_xml src_network src_sql src_testlib - !vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support - include(tools/tools.pro) -} +symbian:SRC_SUBDIRS += src_s60main +SRC_SUBDIRS += src_corelib src_xml src_network src_sql src_testlib win32:SRC_SUBDIRS += src_activeqt - !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus !contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui +!wince*:!symbian:!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support + +!wince*:!symbian-abld:!symbian-sbsv2:include(tools/tools.pro) + contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns |