From 3dcc1a82f7238ebbfb2d3fec4994c33f2976b8a8 Mon Sep 17 00:00:00 2001
From: Jason Barron <jbarron@trolltech.com>
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 <QtCore/qsize.h>
 #include <QtGui/qimage.h>
 
-#include "qeglproperties_p.h"
+#include <private/qeglproperties_p.h>
 
 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 <private/qgraphicsview_p.h>
 
 #include <QtCore/qpoint.h>
 
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 <QtGui/qpaintengine.h>
 
-#include "qpaintengine_p.h"
-#include "qstroker_p.h"
-#include "qpainter_p.h"
-#include "qvectorpath_p.h"
+#include <private/qpaintengine_p.h>
+#include <private/qstroker_p.h>
+#include <private/qpainter_p.h>
+#include <private/qvectorpath_p.h>
 
 
 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 <QtCore/qhash.h>
 
-#include "qpen_p.h"
+#include <private/qpen_p.h>
 
 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 <QtGui/qpaintengine.h>
 
-#include "qpaintengine_p.h"
-#include "qstroker_p.h"
-#include "qpainter_p.h"
+#include <private/qpaintengine_p.h>
+#include <private/qstroker_p.h>
+#include <private/qpainter_p.h>
 
 
 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 <private/qfontengineglyphcache_p.h>
 
 struct glyph_metrics_t;
 typedef unsigned int glyph_t;
-- 
cgit v0.12