summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorGareth Stockwell <gareth.stockwell@sosco.com>2009-09-28 12:42:35 (GMT)
committerGareth Stockwell <gareth.stockwell@sosco.com>2009-09-28 15:04:43 (GMT)
commitd2bceb693aa26937f3def5e1b32fc4411d1b646a (patch)
treeafe0219a5f54380cf808c4a23fdb8c394978f8c3 /mkspecs
parente0fb34194f9ce85f67f158011b4e706835a5667c (diff)
downloadQt-d2bceb693aa26937f3def5e1b32fc4411d1b646a.zip
Qt-d2bceb693aa26937f3def5e1b32fc4411d1b646a.tar.gz
Qt-d2bceb693aa26937f3def5e1b32fc4411d1b646a.tar.bz2
Fixed build errors due to header filename clashes between epoc32/include and Phonon.
Both epoc32/include and $QTDIR/include/Phonon contain a file called videoplayer.h. Both of these directories are listed as SYSTEMINCLUDE paths in the generated MMP file, with the Phonon path coming first. This means that '#include <videoplayer.h>' picks up the Phonon header rather than (as intended) the Symbian one. A new qmake variable, PREPEND_INCLUDEPATH, is defined, allowing the .pro file to specify that /epoc32/include should be the first SYSTEMINCLUDE.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/symbian/qt.prf15
1 files changed, 15 insertions, 0 deletions
diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf
index dd4a4d5..3b24355 100644
--- a/mkspecs/features/symbian/qt.prf
+++ b/mkspecs/features/symbian/qt.prf
@@ -6,6 +6,21 @@ CONFIG += qtmain
load(qt)
+# Allow .pro files to specify include path(s) to be prepended to the list.
+#
+# This allows the project to override the default ordering, whereby paths
+# relative to $$QMAKE_INCDIR_QT always come first. This ordering can cause
+# problems when both the epoc32/include tree and a Qt include directory
+# contain a header of the same name - in this case, the Qt header is always
+# included by virtue of its path appearing first in the SYSTEMINCLUDE
+# directives in the generated MMP file.
+#
+# To work around this situation, the following line can be added to the .pro
+# file:
+# PREPEND_INCLUDEPATH = /epoc32/include
+#
+INCLUDEPATH = $$PREPEND_INCLUDEPATH $$INCLUDEPATH
+
# Add dependency to QtLibs package to all other projects besides QtLibs.
# Note: QtLibs with full capabilities has UID3 of 0x2001E61C,
# while self-signed version typically has temporary UID3 of 0xE001E61C.