Skip to content
Permalink
Browse files
2011-05-05 Alexis Menard <alexis.menard@openbossa.org>
        Reviewed by Benjamin Poulain.

        [Qt] Make QtWebKit build when using gcc 4.6.0
        https://bugs.webkit.org/show_bug.cgi?id=60265

        If QtWebKit is compiled with gcc 4.6.0 and the build is not done
        with c++0x support we need to deactivate warnings about compatibility.
        Some WebKit types have names which conflicts with upcoming c++0x
        types. If QtWebKit is built with c++0x support, WebKit has code to
        fallback to the standard type rather than the WebKit implementation.
        For example nullptr will be the one of the std if build options turns on
        c++0x support.

        * Source/WebKit.pri:
2011-05-05  Alexis Menard  <alexis.menard@openbossa.org>

        Reviewed by Benjamin Poulain.

        [Qt] Make QtWebKit build when using gcc 4.6.0
        https://bugs.webkit.org/show_bug.cgi?id=60265

        If QtWebKit is compiled with gcc 4.6.0 or later we don't want to deactivate
        the c++0x support because it works.

        * JavaScriptCore.pro:


Canonical link: https://commits.webkit.org/75538@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@85855 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Alexis Menard committed May 5, 2011
1 parent d406432 commit 295cb155d979668d92058a4cf9e258fc2b96bdb4
Showing 4 changed files with 41 additions and 2 deletions.
@@ -1,3 +1,20 @@
2011-05-05 Alexis Menard <alexis.menard@openbossa.org>

Reviewed by Benjamin Poulain.

[Qt] Make QtWebKit build when using gcc 4.6.0
https://bugs.webkit.org/show_bug.cgi?id=60265

If QtWebKit is compiled with gcc 4.6.0 and the build is not done
with c++0x support we need to deactivate warnings about compatibility.
Some WebKit types have names which conflicts with upcoming c++0x
types. If QtWebKit is built with c++0x support, WebKit has code to
fallback to the standard type rather than the WebKit implementation.
For example nullptr will be the one of the std if build options turns on
c++0x support.

* Source/WebKit.pri:

2011-05-04 Xan Lopez <xlopez@igalia.com>

Reviewed by Martin Robinson.
@@ -1,3 +1,15 @@
2011-05-05 Alexis Menard <alexis.menard@openbossa.org>

Reviewed by Benjamin Poulain.

[Qt] Make QtWebKit build when using gcc 4.6.0
https://bugs.webkit.org/show_bug.cgi?id=60265

If QtWebKit is compiled with gcc 4.6.0 or later we don't want to deactivate
the c++0x support because it works.

* JavaScriptCore.pro:

2011-05-04 Fridrich Strba <fridrich.strba@bluewin.ch>

Reviewed by Geoffrey Garen.
@@ -217,6 +217,8 @@ symbian: {
QMAKE_CXXFLAGS.ARMCC += -OTime -O3
}

# Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec
*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
lessThan(QT_GCC_MAJOR_VERSION, 5):lessThan(QT_GCC_MINOR_VERSION, 6) {
# Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec.
*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
}

@@ -93,6 +93,14 @@ CONFIG -= warn_on
# Treat warnings as errors on x86/Linux/GCC
linux-g++* {
isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror

greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
# We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
QMAKE_CFLAGS += -Wno-c++0x-compat
QMAKE_CXXFLAGS += -Wno-c++0x-compat
}
}
}

symbian|*-armcc {

0 comments on commit 295cb15

Please sign in to comment.