From 64a17b5b280000058f9af38e26bc9beca1bd15bd Mon Sep 17 00:00:00 2001
From: Jason Barron <jbarron@trolltech.com>
Date: Fri, 25 Sep 2009 15:32:40 +0200
Subject: 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
---
 mkspecs/features/qt_functions.prf | 5 +++++
 1 file changed, 5 insertions(+)

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
-- 
cgit v0.12