diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-28 10:31:05 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-29 15:14:09 +0100 |
| commit | 1371263991489f11774250aa609ace0b12415186 (patch) | |
| tree | 47e89ceb3f73bd25f5c79e50be7f2d66a68c2315 | |
| parent | ec17c3d029f608405252eca20e72b69e58e42b2c (diff) | |
Fix aliasing issues when compiler with non g++ makespecsv5.4.0
As it turns out, need -fno-strict-aliasing. It should not only be applied when
the mkspec happens to have g++ in its name, we also need it for qnx (qcc) and
any other compiler that pretends to be gcc (sets QMAKE_COMPILER to gcc).
Change-Id: Id4d152e4fcaa06ecd8acb47a3d8a41997ba82b75
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -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 { |