diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-04-23 14:08:48 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-04-23 14:08:48 (GMT) |
| commit | fecce960a050ef2964e28f373bf1a35f7d9949a3 (patch) | |
| tree | 296ef35071a80076a5186e71696cddc88cc1a56f /src/src.pro | |
| parent | 02c65146610cdd5bfe1f3ee4656ba07af82afcc7 (diff) | |
| parent | 15088d236924bccee787953e04214f87392e8e55 (diff) | |
| download | Qt-fecce960a050ef2964e28f373bf1a35f7d9949a3.zip Qt-fecce960a050ef2964e28f373bf1a35f7d9949a3.tar.gz Qt-fecce960a050ef2964e28f373bf1a35f7d9949a3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7
Diffstat (limited to 'src/src.pro')
| -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 c74b0ca..1c76d18 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,12 +5,12 @@ unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain 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) +win32:SRC_SUBDIRS += src_activeqt contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg |