diff options
| author | axis <qt-info@nokia.com> | 2010-12-21 09:46:26 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-03-04 10:30:10 (GMT) |
| commit | 5db6d32c57bad7da554363bc7e1e71e24e05c2fa (patch) | |
| tree | 1eb157e00b46b11d73663a7180cb67b0e565d108 | |
| parent | 4c06d1956cc072f5bc52ed8128cf19d4cd7f8715 (diff) | |
| download | Qt-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
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/default_post.prf | 15 | ||||
| -rw-r--r-- | mkspecs/features/symbian/prepend_includepath.prf | 14 |
3 files changed, 15 insertions, 16 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 diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf index a17e760..a05ff25 100644 --- a/mkspecs/features/symbian/default_post.prf +++ b/mkspecs/features/symbian/default_post.prf @@ -53,21 +53,6 @@ isEmpty(TARGET.UID2) { } } -# Allow .pro files to specify include path(s) to be prepended to the list. -# -# This allows the project to override the default ordering, whereby paths -# relative to $$QMAKE_INCDIR_QT always come first. This ordering can cause -# problems when both the epoc32/include tree and a Qt include directory -# contain a header of the same name - in this case, the Qt header is always -# included by virtue of its path appearing first in the SYSTEMINCLUDE -# directives in the generated MMP file. -# -# To work around this situation, the following line can be added to the .pro -# file: -# PREPEND_INCLUDEPATH = /epoc32/include -# -INCLUDEPATH = $$PREPEND_INCLUDEPATH $$INCLUDEPATH - # Add dependency to Qt package to all other projects besides Qt libs. # Note: Qt libs package with full capabilities has UID3 of 0x2001E61C, # while self-signed version typically has temporary UID3 of 0xE001E61C. diff --git a/mkspecs/features/symbian/prepend_includepath.prf b/mkspecs/features/symbian/prepend_includepath.prf new file mode 100644 index 0000000..d9fd4fe --- /dev/null +++ b/mkspecs/features/symbian/prepend_includepath.prf @@ -0,0 +1,14 @@ +# Allow .pro files to specify include path(s) to be prepended to the list. +# +# This allows the project to override the default ordering, whereby paths +# relative to $$QMAKE_INCDIR_QT always come first. This ordering can cause +# problems when both the epoc32/include tree and a Qt include directory +# contain a header of the same name - in this case, the Qt header is always +# included by virtue of its path appearing first in the SYSTEMINCLUDE +# directives in the generated MMP file. +# +# To work around this situation, the following line can be added to the .pro +# file: +# PREPEND_INCLUDEPATH = /epoc32/include +# +INCLUDEPATH = $$PREPEND_INCLUDEPATH $$INCLUDEPATH |