diff options
| author | axis <qt-info@nokia.com> | 2011-01-20 09:41:11 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-03-04 10:30:36 (GMT) |
| commit | 2ad80c0149477a6ca7dd69a7243c2055d208c98d (patch) | |
| tree | 43450bd02ded2a68259cc9284c43a20fd19ae439 /mkspecs/common | |
| parent | b83cbadc80b24107433709f4827e1619a0e7561b (diff) | |
| download | Qt-2ad80c0149477a6ca7dd69a7243c2055d208c98d.zip Qt-2ad80c0149477a6ca7dd69a7243c2055d208c98d.tar.gz Qt-2ad80c0149477a6ca7dd69a7243c2055d208c98d.tar.bz2 | |
Added Symbian deployment localization for makefile build system.
This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6
commit, which adds localization based on TRANSLATIONS keywords for
Raptor and abld.
In addition, since the __PRODUCT_INCLUDE__ define was creating a lot
of trouble regarding < and >, it was refactored into its own source
file, which is automatically included before every source file.
Task: QTBUG-15292
RevBy: Miikka Heikkinen
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 12 | ||||
| -rw-r--r-- | mkspecs/common/symbian/symbianincludes.h | 17 |
2 files changed, 26 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index 899f8c2..f429c1a 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -25,9 +25,15 @@ QMAKE_PREFIX_STATICLIB = QMAKE_SYMBIAN_SHLIB = 1 is_using_gnupoc { - DEFINES *= __PRODUCT_INCLUDE__=\"<$${EPOCROOT}epoc32/include/variant/symbian_os.hrh>\" -} else { - DEFINES *= __PRODUCT_INCLUDE__=\"<$${EPOCROOT}epoc32/include/variant/Symbian_OS.hrh>\" + DEFINES *= __QT_PRODUCT_INCLUDE_IS_LOWERCASE__ +} +QMAKE_SYMBIAN_INCLUDES = $$[QT_INSTALL_DATA]/mkspecs/common/symbian/symbianincludes.h +symbian-armcc { + QMAKE_CFLAGS += --preinclude $$QMAKE_SYMBIAN_INCLUDES + QMAKE_CXXFLAGS += --preinclude $$QMAKE_SYMBIAN_INCLUDES +} else:symbian-gcce { + QMAKE_CFLAGS += -include $$QMAKE_SYMBIAN_INCLUDES + QMAKE_CXXFLAGS += -include $$QMAKE_SYMBIAN_INCLUDES } DEFINES *= \ __SYMBIAN32__ \ diff --git a/mkspecs/common/symbian/symbianincludes.h b/mkspecs/common/symbian/symbianincludes.h new file mode 100644 index 0000000..4c0ffa6 --- /dev/null +++ b/mkspecs/common/symbian/symbianincludes.h @@ -0,0 +1,17 @@ +#ifndef __PRODUCT_INCLUDE__ +# ifdef __QT_PRODUCT_INCLUDE_IS_LOWERCASE__ +# define __PRODUCT_INCLUDE__ <variant/symbian_os.hrh> +# else +# define __PRODUCT_INCLUDE__ <variant/Symbian_OS.hrh> +# endif +#endif + +#ifndef __QT_SYMBIAN_RESOURCE__ +# if defined(__ARMCC__) || defined(__CC_ARM) +# ifdef __QT_RVCT_HEADER_IS_2_2__ +# include <rvct2_2.h> +# else +# include <rvct.h> +# endif +# endif +#endif |