diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-08 14:51:13 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-08 14:53:45 (GMT) |
| commit | ede84a7e3892c952d5b68871da12f0de1d0ab58b (patch) | |
| tree | 3929bef02d26765a2a1a103ee6ca9dd1b84e0a16 /src/src.pro | |
| parent | 4611cc655e3e727dd0ece75ad15b53f2bb5b96d5 (diff) | |
| download | Qt-ede84a7e3892c952d5b68871da12f0de1d0ab58b.zip Qt-ede84a7e3892c952d5b68871da12f0de1d0ab58b.tar.gz Qt-ede84a7e3892c952d5b68871da12f0de1d0ab58b.tar.bz2 | |
Remove some of the symbian workarounds from src.pro.
Previously we had a separate block of things to disable for Symbian OS,
but that isn't really necessary since everything is protected by the
QT_CONFIG variable. Most of these are disabled by default, but if
someone wants to enable them, they can, but might not work.
Reviewed-by: axis <qt-info@nokia.com>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/src.pro b/src/src.pro index 75bef0f..4e26d1d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -7,8 +7,6 @@ wince*:{ SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib } symbian { SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_script src_testlib - contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg - SRC_SUBDIRS += src_plugins SRC_SUBDIRS += $$QT_SOURCE_TREE/src/s60installs/qt_libs.pro } else { SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib @@ -23,13 +21,10 @@ win32:{ !wince*: SRC_SUBDIRS += src_tools_idc } -# TODO the following line should be between opengl and webkit when the 'symbian' block is removed -contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon - -!symbian { 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 +contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg contains(QT_CONFIG, webkit) { #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore @@ -37,7 +32,6 @@ contains(QT_CONFIG, webkit) { } contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools SRC_SUBDIRS += src_plugins -} src_s60main.subdir = $$QT_SOURCE_TREE/src/s60main src_s60main.target = sub-s60main |