summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-06-18 06:48:16 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-06-18 07:51:03 (GMT)
commitd8df7394e72ba536188fd4b5c4a59d02307588ee (patch)
treefdb7b735905af10b320688135aeaeb4b3c259f57
parentddf4061190c7e111e89656a38a3b507370c7f543 (diff)
downloadQt-d8df7394e72ba536188fd4b5c4a59d02307588ee.zip
Qt-d8df7394e72ba536188fd4b5c4a59d02307588ee.tar.gz
Qt-d8df7394e72ba536188fd4b5c4a59d02307588ee.tar.bz2
Always add QtNetwork include path when linking with QtWebkit in Symbian
Due to relative include problem with Symbian toolchains, it is necessary to have include/QtNetwork in systeminclude paths when there is #include <QtWebkit> statement in a source file, as QtWebkit header includes QtNetwork header. Task-number: QTBUG-11494 Reviewed-by: Janne Koskinen
-rw-r--r--mkspecs/features/qt_functions.prf3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index a49c1a6..afc708a 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -51,8 +51,9 @@ defineTest(qtAddLibrary) {
INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
}
isEqual(LIB_NAME, QtWebKit) {
- # Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain
+ # Needed for because relative inclusion problem in toolchain
INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtXmlPatterns
+ INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork
}
isEqual(LIB_NAME, QtXmlPatterns) {
# Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain