diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-09-02 13:43:17 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-09-02 13:43:17 (GMT) |
| commit | 2bb571fe49d05b06b13aedc4f7fb71cbb1c949be (patch) | |
| tree | ac37be379829c9aa5e9853763cb7f7d1a22464b8 /src/corelib/global | |
| parent | 0d54ade501443d8a3b0e756520f6c43e602f1283 (diff) | |
| parent | 7aed1cf06ed7b50f060ebce7a5a041c752989307 (diff) | |
| download | Qt-2bb571fe49d05b06b13aedc4f7fb71cbb1c949be.zip Qt-2bb571fe49d05b06b13aedc4f7fb71cbb1c949be.tar.gz Qt-2bb571fe49d05b06b13aedc4f7fb71cbb1c949be.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/global.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 2505e72..260ed59 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -19,7 +19,7 @@ INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global # Only used on platforms with CONFIG += precompile_header PRECOMPILED_HEADER = global/qt_pch.h -linux*:!static { +linux*:!static:!linux-armcc:!linux-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\')\\\" |