diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 12:59:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 12:59:07 +0100 |
| commit | ae753a2e59c89636f4f7ab9f3edfca96f30bb5ca (patch) | |
| tree | e8ba863671667f4e20a5714d0342949a419c7873 | |
| parent | 6a9621dc588b2f6509de3e6635d0ec2cf36bff3e (diff) | |
| parent | 1371263991489f11774250aa609ace0b12415186 (diff) | |
| download | qtscript-ae753a2e59c89636f4f7ab9f3edfca96f30bb5ca.tar.gz | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: Ia7239e9362ee936303aaa084cba0fd67c5576c48
| -rw-r--r-- | src/3rdparty/javascriptcore/WebKit.pri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri index 79f3f85..69c412f 100644 --- a/src/3rdparty/javascriptcore/WebKit.pri +++ b/src/3rdparty/javascriptcore/WebKit.pri @@ -55,8 +55,10 @@ CONFIG(release, debug|release) { BASE_DIR = $$PWD INCLUDEPATH += $$PWD/WebKit/qt/Api +gcc: QMAKE_CXXFLAGS += -fno-strict-aliasing + CONFIG -= warn_on -*-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self +*-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT *-armcc { |