diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:17 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:20 +0200 |
| commit | 42f2da5e6b543e698fc4f036c45ebb15078409c8 (patch) | |
| tree | 2d688b1a812d8410d4ae85283d5e413957000e11 /src/src.pro | |
| parent | e9962cc300a805ce09a02ce0c9ae23ceaf8073bb (diff) | |
| parent | 009f3d14045e2e2a6eff8c87a8da9eaa621c5249 (diff) | |
| download | qtbase-42f2da5e6b543e698fc4f036c45ebb15078409c8.tar.gz | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/src.pro
Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/src.pro b/src/src.pro index 1e072fbec7..a531355ae9 100644 --- a/src/src.pro +++ b/src/src.pro @@ -13,7 +13,9 @@ SRC_SUBDIRS += src_corelib SRC_SUBDIRS += src_network src_sql src_gui src_xml src_uitools src_widgets src_printsupport src_testlib src_platformsupport nacl: SRC_SUBDIRS -= src_network src_testlib !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus + contains(QT_CONFIG, no-gui): SRC_SUBDIRS -= src_gui +!contains(QT_CONFIG, no-v8): SRC_SUBDIRS += src_v8 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl SRC_SUBDIRS += src_plugins @@ -30,6 +32,8 @@ src_winmain.subdir = $$QT_SOURCE_TREE/src/winmain src_winmain.target = sub-winmain src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib src_corelib.target = sub-corelib +src_v8.subdir = $$QT_SOURCE_TREE/src/v8 +src_v8.target = sub-v8 src_xml.subdir = $$QT_SOURCE_TREE/src/xml src_xml.target = sub-xml src_uitools.subdir = $$QT_SOURCE_TREE/src/uitools |