summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-12-21 09:46:26 (GMT)
committeraxis <qt-info@nokia.com>2011-03-04 10:30:10 (GMT)
commit5db6d32c57bad7da554363bc7e1e71e24e05c2fa (patch)
tree1eb157e00b46b11d73663a7180cb67b0e565d108 /mkspecs/common
parent4c06d1956cc072f5bc52ed8128cf19d4cd7f8715 (diff)
downloadQt-5db6d32c57bad7da554363bc7e1e71e24e05c2fa.zip
Qt-5db6d32c57bad7da554363bc7e1e71e24e05c2fa.tar.gz
Qt-5db6d32c57bad7da554363bc7e1e71e24e05c2fa.tar.bz2
Fixed PREPEND_INCLUDEPATH being executed too early.
It used to be carried out inside qt.prf, but was moved to default_post.prf. However, since qt.prf is executed after default_post.prf, it would still prepend its own include paths at the very front, which is wrong. Fixed by introducing a new feature profile for PREPEND_INCLUDEPATH, which is run after qt.prf (features in $$CONFIG are executed in reverse order). RevBy: Miikka Heikkinen
Diffstat (limited to 'mkspecs/common')
-rw-r--r--mkspecs/common/symbian/symbian.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 0bb3a29..e733ade 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -3,7 +3,7 @@
#
TEMPLATE = app
-CONFIG += qt warn_on release incremental link_prl sis_targets run_on_phone
+CONFIG += prepend_includepath qt warn_on release incremental link_prl sis_targets run_on_phone
QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib