diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-20 14:09:29 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-20 14:09:29 (GMT) |
| commit | 7871ebfc4d2adf2313c7431c9d6fa221a903b81d (patch) | |
| tree | a7574187277d5615e26ab4a9f4b1b27b8b6e5422 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | |
| parent | 4fbf19955d5c018d8f12611d39348b48be3ff006 (diff) | |
| parent | 991a5ed5a8dc0c81d56c88823bd69d986618d4e5 (diff) | |
| download | Qt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.zip Qt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.tar.gz Qt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | 2 |
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 } |