summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-19 12:09:00 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-19 12:09:00 (GMT)
commit114efc17bcc32bebf5639d5d2ef8a543bb9fe952 (patch)
tree5dad1c35e6da37ac6ed4a0c18d80c6e065cb8e18 /src/3rdparty/webkit
parentacb5cd795f4ea75794cfd31eaf768ec5a3e62844 (diff)
downloadQt-114efc17bcc32bebf5639d5d2ef8a543bb9fe952.zip
Qt-114efc17bcc32bebf5639d5d2ef8a543bb9fe952.tar.gz
Qt-114efc17bcc32bebf5639d5d2ef8a543bb9fe952.tar.bz2
Revert "Revert "Fix detection of linux-g++""
This reverts commit baab5f7e77c1216ede839766c97abef1a708b365. Reviewed-by: Paul
Diffstat (limited to 'src/3rdparty/webkit')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
index 8bd4225..bb531e5 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -54,7 +54,7 @@ win32-* {
# Rules when JIT enabled (not disabled)
!contains(DEFINES, ENABLE_JIT=0) {
- linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
+ linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
QMAKE_CXXFLAGS += -fno-stack-protector
QMAKE_CFLAGS += -fno-stack-protector
}