diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-04-22 18:55:14 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-04-22 18:55:14 (GMT) |
| commit | 3e81eef4d4b857d4938168d3309913d88e4f18bd (patch) | |
| tree | 622ad41ef695fffbf53c9c9936cbc737441123a1 /src/src.pro | |
| parent | 744db77f203b4a0c234b32a3f56edf1901b35b3a (diff) | |
| parent | 70bafa8e138d938fd34736c46b015d88b5d7feef (diff) | |
| download | Qt-3e81eef4d4b857d4938168d3309913d88e4f18bd.zip Qt-3e81eef4d4b857d4938168d3309913d88e4f18bd.tar.gz Qt-3e81eef4d4b857d4938168d3309913d88e4f18bd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
tools/qdoc3/test/qdeclarative.qdocconf
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 |