diff options
| author | Bill King <bill.king@nokia.com> | 2009-11-20 04:29:51 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-11-20 04:29:51 (GMT) |
| commit | 5b1a07e9ccf0a5139273b447e2b2fda6564a506a (patch) | |
| tree | 6ad6fc7836747044713ade6e75d7230b848ba46e /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | |
| parent | 0186faea383f3f8223bffd1844e5a47ca22770a5 (diff) | |
| parent | ea0f526ac3a7daef5d4ebff2373a01d4088e28c3 (diff) | |
| download | Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.zip Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.tar.gz Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt 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 bb531e5..8bd4225 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 } |