diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-05 02:12:31 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-05 02:12:31 (GMT) |
| commit | 5a98d58c1ed78262c20b05aa178a92b4a1a097df (patch) | |
| tree | 00c8c459c2bdbf438a35e5087250319d4766fe29 /mkspecs/common/symbian/symbian-makefile.conf | |
| parent | 7de5f19f0f62f181132394da6d7b2c8484cd42d9 (diff) | |
| parent | 5749421fdaff0305d217712e3174c85a76b367c4 (diff) | |
| download | Qt-5a98d58c1ed78262c20b05aa178a92b4a1a097df.zip Qt-5a98d58c1ed78262c20b05aa178a92b4a1a097df.tar.gz Qt-5a98d58c1ed78262c20b05aa178a92b4a1a097df.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'mkspecs/common/symbian/symbian-makefile.conf')
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index b1ca367..364e91b 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -29,7 +29,12 @@ QMAKE_PREFIX_STATICLIB = QMAKE_EXTENSION_STATICLIB = lib QMAKE_SYMBIAN_SHLIB = 1 -DEFINES *= __PRODUCT_INCLUDE__=\\<$${EPOCROOT}epoc32/include/variant/symbian_os.hrh\\> \ +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 *= \ __SYMBIAN32__ \ __MARM_INTERWORK__ \ _UNICODE \ |