diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-04-27 05:22:20 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-04-27 05:22:20 (GMT) |
| commit | dcf9a1f2f20248de0da9549af54bc3a4844eaf5b (patch) | |
| tree | c9eee3ff39000816113bcab3a5c035da97c2a9fc /src/corelib/global/global.pri | |
| parent | 47712d1f330e4b22ce6dd30e7557288ef7f7fca0 (diff) | |
| parent | 415951891cd75170f1e4b89b46effa3319b56e4e (diff) | |
| download | Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.zip Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.tar.gz Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
Diffstat (limited to 'src/corelib/global/global.pri')
| -rw-r--r-- | src/corelib/global/global.pri | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 86800ef..8ff423e 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -19,13 +19,16 @@ INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global # Only used on platforms with CONFIG += precompile_header PRECOMPILED_HEADER = global/qt_pch.h -linux*:!static:!linux-armcc:!linux-gcce { +linux*:!static:!symbian-armcc:!symbian-gcce { QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate prog=$$quote(if (/program interpreter: (.*)]/) { print $1; }) DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\" } # Compensate for lack of platform defines in Symbian3 and Symbian4 -symbian: DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_)) +symbian { + DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_)) \ + S60_VERSION_$$upper($$replace(S60_VERSION,\\.,_)) +} include(../../../tools/shared/symbian/epocroot.pri) |