summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2009-11-19 10:26:44 (GMT)
committerPaul Olav Tvete <paul.tvete@nokia.com>2009-11-19 10:48:30 (GMT)
commitbaab5f7e77c1216ede839766c97abef1a708b365 (patch)
tree5c59933ce877f5b1bd33bfce91b9f825bfee2336 /src/corelib
parent8c6edd82358a37bf906e3994eea069a3b93e85fc (diff)
downloadQt-baab5f7e77c1216ede839766c97abef1a708b365.zip
Qt-baab5f7e77c1216ede839766c97abef1a708b365.tar.gz
Qt-baab5f7e77c1216ede839766c97abef1a708b365.tar.bz2
Revert "Fix detection of linux-g++"
This reverts commit 333bd2e761af8aaf6efd3d66eb028af046c4dfc2. The change broke compilation of QWS, since QtGui depends on glib, but doesn't link with it directly. This needs to be fixed properly, but not just before the release. Reviewed-by: Harald Fernengel
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/global.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index b916b4d..0fe757d 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\')\\\"