summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@digia.com>2009-10-14 13:54:02 (GMT)
committerJanne Koskinen <janne.p.koskinen@digia.com>2009-10-14 13:54:02 (GMT)
commitc19f93eee1219ff91772f34d32b8ff4c20a4341d (patch)
treec7ff82043ed99b39cbebaab3fbbd9eb12153e325
parent1c20d834c004bb57b1f2274c10a9f983b32fda1f (diff)
downloadQt-c19f93eee1219ff91772f34d32b8ff4c20a4341d.zip
Qt-c19f93eee1219ff91772f34d32b8ff4c20a4341d.tar.gz
Qt-c19f93eee1219ff91772f34d32b8ff4c20a4341d.tar.bz2
QtWebkit demos&examples compilation fix for Symbian
Fix for applications not compiling containing #include<QtWebkit> due to relative inclusion problem in Symbian build environment. Task-number: QTBUG-4846 Reviewed-by: Iain
-rw-r--r--mkspecs/features/qt_functions.prf12
1 files changed, 9 insertions, 3 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 6322233..3f84f42 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -45,9 +45,15 @@ defineTest(qtAddLibrary) {
}
}
}
- symbian*:isEqual(LIB_NAME, QtGui) {
- # Needed for #include <QtGui> because qs60mainapplication.h includes aknapp.h
- INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
+ symbian {
+ isEqual(LIB_NAME, QtGui) {
+ # Needed for #include <QtGui> because qs60mainapplication.h includes aknapp.h
+ INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
+ }
+ isEqual(LIB_NAME, QtWebKit) {
+ # Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain
+ INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtXmlPatterns
+ }
}
isEmpty(LINKAGE) {
if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {