summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-09-25 13:32:40 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-09-25 14:33:45 (GMT)
commit64a17b5b280000058f9af38e26bc9beca1bd15bd (patch)
treee89b3249239549b91866a85e63e6baa07ecb0acb /mkspecs/features
parentd811a26dc7e821537e9cbd8a275093e58cf0d185 (diff)
downloadQt-64a17b5b280000058f9af38e26bc9beca1bd15bd.zip
Qt-64a17b5b280000058f9af38e26bc9beca1bd15bd.tar.gz
Qt-64a17b5b280000058f9af38e26bc9beca1bd15bd.tar.bz2
Fix compilation of files that #include <QtGui> on newer Symbian SDKs.
The new public classes in the 's60framework' sub-directory of QtGui introduce a header file dependency to the middleware layer of the SDK by including 'aknapp.h'. Since the build system doesn't know if you have included QtGui or not, the closest approximation is to append the middleware layer include path in cases where the QT variable contains 'gui' Reviewed-by: axis
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/qt_functions.prf5
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 8956ef7..645aa3a 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -45,6 +45,11 @@ defineTest(qtAddLibrary) {
}
}
}
+ symbian*:isEqual(LIB_NAME, QtGui) {
+ # Needed for #include <QtGui> because qs60mainapplication.h includes aknapp.h
+ INCLUDEPATH -= $$MW_LAYER_SYSTEMINCLUDE
+ INCLUDEPATH = $$MW_LAYER_SYSTEMINCLUDE $$INCLUDEPATH
+ }
isEmpty(LINKAGE) {
CONFIG(debug, debug|release) {
win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d