diff options
| author | Bill King <bill.king@nokia.com> | 2009-11-18 22:32:16 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-11-18 22:32:16 (GMT) |
| commit | 0186faea383f3f8223bffd1844e5a47ca22770a5 (patch) | |
| tree | 8b17a7c752ada7c06d1d9b88575d5bd467dd3fbe /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | |
| parent | c7ef9c969fb368027135c5e7b0e9b6f53c465702 (diff) | |
| parent | 80cd617b05ad3e647c87dc063d40cde0617344ca (diff) | |
| download | Qt-0186faea383f3f8223bffd1844e5a47ca22770a5.zip Qt-0186faea383f3f8223bffd1844e5a47ca22770a5.tar.gz Qt-0186faea383f3f8223bffd1844e5a47ca22770a5.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 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 } |