diff options
Diffstat (limited to 'src/3rdparty/webkit/WebKit.pri')
| -rw-r--r-- | src/3rdparty/webkit/WebKit.pri | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri index b363365..ded4701 100644 --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/WebKit.pri @@ -39,15 +39,24 @@ CONFIG(release, debug|release) { BASE_DIR = $$PWD INCLUDEPATH += $$PWD/WebKit/qt/Api +CONFIG -= warn_on +*-g++*:QMAKE_CXXFLAGS += -Wreturn-type -fno-strict-aliasing +#QMAKE_CXXFLAGS += -Wall -Wno-undef -Wno-unused-parameter + # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT -*-armcc { - QMAKE_CFLAGS += --gnu - QMAKE_CXXFLAGS += --gnu --no_parse_templates +symbian|*-armcc { + RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293 + RVCT_COMMON_CXXFLAGS = $$RVCT_COMMON_CFLAGS --no_parse_templates + DEFINES *= QT_NO_UITOOLS } +*-armcc { + QMAKE_CFLAGS += $$RVCT_COMMON_CFLAGS + QMAKE_CXXFLAGS += $$RVCT_COMMON_CXXFLAGS +} + symbian { - QMAKE_CXXFLAGS.ARMCC += --gnu --no_parse_templates - DEFINES *= QT_NO_UITOOLS + QMAKE_CXXFLAGS.ARMCC += $$RVCT_COMMON_CXXFLAGS } contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools |