diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2010-03-04 17:27:46 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2010-03-04 17:35:54 (GMT) |
| commit | 778b9dcb5ad6aba8b0548719c2674e3e6ad66c58 (patch) | |
| tree | d13c642497f449d4e916eb159fb49fa36936596c /mkspecs | |
| parent | 94d520d9566221250e732b120ea90210f81805bf (diff) | |
| download | Qt-778b9dcb5ad6aba8b0548719c2674e3e6ad66c58.zip Qt-778b9dcb5ad6aba8b0548719c2674e3e6ad66c58.tar.gz Qt-778b9dcb5ad6aba8b0548719c2674e3e6ad66c58.tar.bz2 | |
Change WINSCW include paths to use same rules as ARMCC
The default rules applied by symbian cause problems with headers included
from within other headers.
This only affects WINSCW builds, so the headers always need to be specially
fixed up to be compatible, which is wrong.
Instead, use CXXFLAGS to change the include path rules to be the same as
Reviewed-by: Iain
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 48a28b7..9c5bcf4 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -28,7 +28,12 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CXX = g++ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS.CW = +# Symbian build system applies -cwd source on the MWCC command line. +# this causes problems with include paths, -cwd include uses the same +# rules for include paths as ARMCC +# This should really be fixed in raptor, as using CXXFLAGS means we pass +# both on the command line and rely on the compiler using the last specified +QMAKE_CXXFLAGS.CW = -cwd include QMAKE_CXXFLAGS.ARMCC = --visibility_inlines_hidden QMAKE_CXXFLAGS.GCCE = -fvisibility-inlines-hidden QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS |