diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-27 07:40:38 (GMT) |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-27 07:40:38 (GMT) |
commit | e4feb707118947feea8568a82d57a8db6ae59410 (patch) | |
tree | ecf77b7d677f174b59e1c5110dd7aebee877f02d /mkspecs/common | |
parent | 85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34 (diff) | |
parent | 2925995de32f76a72fcdd7d577e609a68a517fa1 (diff) | |
download | Qt-e4feb707118947feea8568a82d57a8db6ae59410.zip Qt-e4feb707118947feea8568a82d57a8db6ae59410.tar.gz Qt-e4feb707118947feea8568a82d57a8db6ae59410.tar.bz2 |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/corelib/global/qglobal.h
Diffstat (limited to 'mkspecs/common')
-rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index 364e91b..9dc3674 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -30,9 +30,9 @@ QMAKE_EXTENSION_STATICLIB = lib QMAKE_SYMBIAN_SHLIB = 1 is_using_gnupoc { - DEFINES *= __PRODUCT_INCLUDE__=\\<$${EPOCROOT}epoc32/include/variant/symbian_os.hrh\\> + DEFINES *= __PRODUCT_INCLUDE__=\"<$${EPOCROOT}epoc32/include/variant/symbian_os.hrh>\" } else { - DEFINES *= __PRODUCT_INCLUDE__=\\<$${EPOCROOT}epoc32/include/variant/Symbian_OS.hrh\\> + DEFINES *= __PRODUCT_INCLUDE__=\"<$${EPOCROOT}epoc32/include/variant/Symbian_OS.hrh>\" } DEFINES *= \ __SYMBIAN32__ \ |