diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-20 08:30:24 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-20 08:30:31 (GMT) |
| commit | 3e5d4bcbcd6a4bdf0bfd6ae5933a61293720656a (patch) | |
| tree | 3c19344f403677d43f495f879acc648089e68492 /src/3rdparty | |
| parent | ea0f526ac3a7daef5d4ebff2373a01d4088e28c3 (diff) | |
| parent | b345b96dc14cc0da3a9ff44216d447e6f2c8ad97 (diff) | |
| download | Qt-3e5d4bcbcd6a4bdf0bfd6ae5933a61293720656a.zip Qt-3e5d4bcbcd6a4bdf0bfd6ae5933a61293720656a.tar.gz Qt-3e5d4bcbcd6a4bdf0bfd6ae5933a61293720656a.tar.bz2 | |
Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 into 4.6
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri index ea6e5ab..28328e7 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri @@ -52,7 +52,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 } 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 } |