diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-20 08:30:24 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-20 08:30:31 (GMT) |
| commit | 3e5d4bcbcd6a4bdf0bfd6ae5933a61293720656a (patch) | |
| tree | 3c19344f403677d43f495f879acc648089e68492 /src/corelib | |
| parent | ea0f526ac3a7daef5d4ebff2373a01d4088e28c3 (diff) | |
| parent | b345b96dc14cc0da3a9ff44216d447e6f2c8ad97 (diff) | |
| download | Qt-3e5d4bcbcd6a4bdf0bfd6ae5933a61293720656a.zip Qt-3e5d4bcbcd6a4bdf0bfd6ae5933a61293720656a.tar.gz Qt-3e5d4bcbcd6a4bdf0bfd6ae5933a61293720656a.tar.bz2 | |
Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 into 4.6
Diffstat (limited to 'src/corelib')
| -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 0fe757d..b916b4d 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-g++*:!static { +linux*-g++*:!static { 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\')\\\" |