diff options
author | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
---|---|---|
committer | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
commit | e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d (patch) | |
tree | 08fa39a9605ec38a45247baea0e2053179f5970f /src/corelib/global/global.pri | |
parent | 838ed9c68aef4d5a4f0b4d4dbbc1c1f7797cde91 (diff) | |
parent | 901ea45ca02dc8fbbf3f6112240c4e468c240b73 (diff) | |
download | Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.zip Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.gz Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.bz2 |
Merge commit 'origin/master' into fileEngines
Conflicts:
src/s60installs/bwins/QtCoreu.def
Diffstat (limited to 'src/corelib/global/global.pri')
-rw-r--r-- | src/corelib/global/global.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 260ed59..4800716 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -24,3 +24,6 @@ linux*:!static:!linux-armcc:!linux-gcce { 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,\\.,_)) |