diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-09 12:51:06 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-10 12:15:04 (GMT) |
| commit | 8dd695793dd41dc57ded6506aadbd23786e11cf4 (patch) | |
| tree | a69787167b6813b2b3e61479e8fa271117a43324 /mkspecs/common | |
| parent | 66619b3e6dd8c94564d8d63295780a42ca87e6d3 (diff) | |
| download | Qt-8dd695793dd41dc57ded6506aadbd23786e11cf4.zip Qt-8dd695793dd41dc57ded6506aadbd23786e11cf4.tar.gz Qt-8dd695793dd41dc57ded6506aadbd23786e11cf4.tar.bz2 | |
Add '.' dir as the first include directory in Symbian
RVCT seems to use '.' directory implictly as the first include path,
but WINSCW compiler doesn't do this, so add it explicitly to make sure
both builds have similar include order.
Part of QtP delta reduction effort.
Reviewed-by: Janne Anttila
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index a90ef91..77b42a9 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -120,14 +120,17 @@ MMP_RULES += PAGED BYTEPAIRCOMPRESSTARGET MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6 -# Legacy support requires some hardcoded stdapis paths. INCLUDEPATH = \ $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off \ $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian \ $${EPOCROOT}epoc32/include \ $$OS_LAYER_LIBC_SYSTEMINCLUDE \ $$INCLUDEPATH - + +# Ensure '.' directory is the first in include path. +# RVCT seems to do this automatically, but WINSCW compiler does not, so add it here. +MMP_RULES += "USERINCLUDE ." + # Supports S60 3.0, 3.1, 3.2 and 5.0 by default default_deployment.pkg_prerules = \ "; Default HW/platform dependencies" \ |