summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/src.pro8
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