summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-02-08 16:05:53 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-02-08 16:47:02 (GMT)
commit4f7a73a8281623e3d41e527924fe9c0ffd9977e1 (patch)
treeeb2419ef092bc9c36320cb183340bc87f4e384d8 /mkspecs
parent877da0d056d0b0c078d07165be11a1ffca4730ea (diff)
downloadQt-4f7a73a8281623e3d41e527924fe9c0ffd9977e1.zip
Qt-4f7a73a8281623e3d41e527924fe9c0ffd9977e1.tar.gz
Qt-4f7a73a8281623e3d41e527924fe9c0ffd9977e1.tar.bz2
Workaround public header depending on private in symbian^3
f32file.h (public) depends on e32svr.h (private), and in symbian^3 the private headers have been moved to a different include path. Reviewed-by: axis
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_functions.prf7
1 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index f1c3e13..1fb6298 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -46,7 +46,12 @@ defineTest(qtAddLibrary) {
}
}
symbian {
- isEqual(LIB_NAME, QtGui) {
+ isEqual(LIB_NAME, QtCore) {
+ #workaround for dependency from f32file.h on e32svr.h which has moved location in symbian3
+ contains(SYMBIAN_VERSION, Symbian3) {
+ INCLUDEPATH *= $$OS_LAYER_SYSTEMINCLUDE
+ }
+ } else:isEqual(LIB_NAME, QtGui) {
# Needed for #include <QtGui> because qs60mainapplication.h includes aknapp.h
INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
} else:isEqual(LIB_NAME, QtWebKit) {