diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-30 15:52:24 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-30 15:52:24 (GMT) |
| commit | badcaa75b4a5e5dfbb85f5abf856abcfcfa20533 (patch) | |
| tree | 70df9d393d3b6946178378560834239c81fdabf0 /mkspecs/features | |
| parent | 86b4c125372f02c21be81fff376817852c28afa9 (diff) | |
| parent | 2e16dff13d260e8ba07534b36ac635c9e625e442 (diff) | |
| download | Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.zip Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.tar.gz Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/debug_and_release.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/mkspecs/features/debug_and_release.prf b/mkspecs/features/debug_and_release.prf index 19031ef..ef33789 100644 --- a/mkspecs/features/debug_and_release.prf +++ b/mkspecs/features/debug_and_release.prf @@ -1 +1 @@ -!macx-xcode:!symbian-abld:addExclusiveBuilds(debug, Debug, release, Release) +!macx-xcode:!symbian:addExclusiveBuilds(debug, Debug, release, Release) diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index dd4a4d5..3b24355 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -6,6 +6,21 @@ CONFIG += qtmain load(qt) +# 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 QtLibs package to all other projects besides QtLibs. # Note: QtLibs with full capabilities has UID3 of 0x2001E61C, # while self-signed version typically has temporary UID3 of 0xE001E61C. |