diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:54:19 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:54:19 +0100 |
| commit | 7a290532cc0ff56c05bb7d3dbb8fd00bd568e462 (patch) | |
| tree | a6d9d0cbbdc99ae28015dd566412840501381faa | |
| parent | 693d8f8172e35d6fca3080538e05862071c4de8b (diff) | |
| parent | ae753a2e59c89636f4f7ab9f3edfca96f30bb5ca (diff) | |
| download | qtscript-7a290532cc0ff56c05bb7d3dbb8fd00bd568e462.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ib2bcdfc23e0e8274e8cc43ed34ec34b1e0cb986d
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/WebKit.pri | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp index 9cd3d12..c37bf51 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp @@ -719,7 +719,7 @@ const char* compileRegex(const UString& patternString, RegexPattern& pattern) constructor.setupOffsets(); - return false; + return NULL; }; 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 { |