Changeset 153520 in webkit


Ignore:
Timestamp:
Jul 31, 2013 6:09:38 AM (11 years ago)
Author:
allan.jensen@digia.com
Message:

[Qt] Build WebKit with C++11
​https://bugs.webkit.org/show_bug.cgi?id=119337

Reviewed by Csaba Osztrogonác.

Source/WebKit2:

We no longer need to enable C++11 specifically for WebKit2.

  • WebKit2.pri:

Tools:

Enable building with C++11.

  • qmake/mkspecs/features/default_pre.prf:
  • qmake/mkspecs/features/unix/default_post.prf:
  • qmake/mkspecs/features/unix/default_pre.prf:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r153511 r153520  
     12013-07-31  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] Build WebKit with C++11
     4        https://bugs.webkit.org/show_bug.cgi?id=119337
     5
     6        Reviewed by Csaba Osztrogonác.
     7
     8        We no longer need to enable C++11 specifically for WebKit2.
     9
     10        * WebKit2.pri:
     11
    1122013-07-30  Tim Horton  <timothy_horton@apple.com>
    213

  • trunk/Source/WebKit2/WebKit2.pri

    r149291 r153520  
    8787enable?(SECCOMP_FILTERS): PKGCONFIG += libseccomp
    8888
    89 CONFIG += c++11

  • trunk/Tools/ChangeLog

    r153519 r153520  
     12013-07-31  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] Build WebKit with C++11
     4        https://bugs.webkit.org/show_bug.cgi?id=119337
     5
     6        Reviewed by Csaba Osztrogonác.
     7
     8        Enable building with C++11.
     9
     10        * qmake/mkspecs/features/default_pre.prf:
     11        * qmake/mkspecs/features/unix/default_post.prf:
     12        * qmake/mkspecs/features/unix/default_pre.prf:
     13
    1142013-07-31  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    215

  • trunk/Tools/qmake/mkspecs/features/default_pre.prf

    r148744 r153520  
    9898}
    9999
     100# WebKit depends on C++11 now.
     101CONFIG += c++11
     102
    100103# A newer version of flex is required on Windows. At the moment the only
    101104# one that appears to provide binaries and is not cygwin is winflex.

  • trunk/Tools/qmake/mkspecs/features/unix/default_post.prf

    r143452 r153520  
    2222        isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
    2323    }
    24     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
    25         !contains(QMAKE_CXXFLAGS, -std=(c|gnu)\\+\\+(0x|11)) {
    26             # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
    27             QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
    28             QMAKE_CXXFLAGS += -Wno-c++0x-compat
    29         }
    30     }
    31 }
    32 
    33 # Don't warn about OVERRIDE and FINAL, since they are feature-checked anyways
    34 *clang:!contains(QMAKE_CXXFLAGS, -std=c++11) {
    35     QMAKE_CXXFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
    36     QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
    3724}
    3825

  • trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf

    r151111 r153520  
    1919# Reduce linking memory pressure on 32-bit debug builds on Linux
    2020linux-g++*:CONFIG(debug, debug|release):isEqual(QT_ARCH,i386): CONFIG += use_all_in_one_files
    21 *clang: CONFIG += c++11
    2221
    2322load(default_pre)
Note: See TracChangeset for help on using the changeset viewer.