From ede84a7e3892c952d5b68871da12f0de1d0ab58b Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Wed, 8 Jul 2009 16:51:13 +0200 Subject: 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 --- src/src.pro | 8 +------- 1 file changed, 1 insertion(+), 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 -- cgit v0.12 From da27bdb75340064ac2fd6cdddb40311122b9235f Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Wed, 8 Jul 2009 17:05:36 +0200 Subject: Move the EGL library to a different qmake variable. The EGL code is now a part of QtGui so QtOpenVG doesn't need to link against it anymore. This also removes the need to link against cone since we don't need to call DrawableWindow() from the OpenVG code. We add the EGL library to a separate variable which is then used when QT_CONFIG contains the "egl" feature. --- mkspecs/common/symbian/symbian.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 663a1df..436f134 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -69,8 +69,9 @@ QMAKE_LIBS = -llibc -llibm -leuser -llibdl QMAKE_LIBS_CORE = $$QMAKE_LIBS -llibpthread -lefsrv QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore $$QMAKE_DESKTOPSERVICES_LIBS $$QMAKE_STATUSPANE_LIBS -lmediaclientaudio QMAKE_LIBS_NETWORK = +QMAKE_LIBS_EGL = -llibEGL QMAKE_LIBS_OPENGL = -QMAKE_LIBS_OPENVG = -llibOpenVG -llibEGL -lcone +QMAKE_LIBS_OPENVG = -llibOpenVG QMAKE_LIBS_COMPAT = QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib -- cgit v0.12 From 3dcc1a82f7238ebbfb2d3fec4994c33f2976b8a8 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Wed, 8 Jul 2009 17:31:14 +0200 Subject: Change the inclusion method here to use system includes. This is a workaround for a bug in the Symbian toolchain where user includes are included relative to the source file instead of to the header that actually included it. Making them system includes seems to work around the issue without introducing problems on other platforms (so far?). These particular files cause problems because they are included by modules other than QtGui such as QtOpenVG and QtSVG. --- src/gui/egl/qegl_p.h | 2 +- src/gui/graphicsview/qgraphicsitem_p.h | 2 +- src/gui/painting/qpaintengineex_p.h | 8 ++++---- src/gui/painting/qpainter_p.h | 2 +- src/gui/painting/qvectorpath_p.h | 6 +++--- src/gui/text/qfontengine_p.h | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h index ddf7d27..b457552 100644 --- a/src/gui/egl/qegl_p.h +++ b/src/gui/egl/qegl_p.h @@ -56,7 +56,7 @@ #include #include -#include "qeglproperties_p.h" +#include QT_BEGIN_INCLUDE_NAMESPACE diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index a0d061b..15b9ab6 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -56,7 +56,7 @@ #include "qgraphicsitem.h" #include "qset.h" #include "qpixmapcache.h" -#include "qgraphicsview_p.h" +#include #include diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h index d4e4862..2a50a51 100644 --- a/src/gui/painting/qpaintengineex_p.h +++ b/src/gui/painting/qpaintengineex_p.h @@ -55,10 +55,10 @@ #include -#include "qpaintengine_p.h" -#include "qstroker_p.h" -#include "qpainter_p.h" -#include "qvectorpath_p.h" +#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h index 8e9d61e..4364772 100644 --- a/src/gui/painting/qpainter_p.h +++ b/src/gui/painting/qpainter_p.h @@ -63,7 +63,7 @@ #include "QtGui/qpaintengine.h" #include -#include "qpen_p.h" +#include QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h index b6b85fa..e3cb333 100644 --- a/src/gui/painting/qvectorpath_p.h +++ b/src/gui/painting/qvectorpath_p.h @@ -55,9 +55,9 @@ #include -#include "qpaintengine_p.h" -#include "qstroker_p.h" -#include "qpainter_p.h" +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index 9026a41..5cd5acc 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -70,7 +70,7 @@ # include "private/qcore_mac_p.h" #endif -#include "qfontengineglyphcache_p.h" +#include struct glyph_metrics_t; typedef unsigned int glyph_t; -- cgit v0.12