Changeset 85855 in webkit
- Timestamp:
- May 5, 2011 8:44:42 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r85819 r85855 1 2011-05-05 Alexis Menard <alexis.menard@openbossa.org> 2 3 Reviewed by Benjamin Poulain. 4 5 [Qt] Make QtWebKit build when using gcc 4.6.0 6 https://bugs.webkit.org/show_bug.cgi?id=60265 7 8 If QtWebKit is compiled with gcc 4.6.0 and the build is not done 9 with c++0x support we need to deactivate warnings about compatibility. 10 Some WebKit types have names which conflicts with upcoming c++0x 11 types. If QtWebKit is built with c++0x support, WebKit has code to 12 fallback to the standard type rather than the WebKit implementation. 13 For example nullptr will be the one of the std if build options turns on 14 c++0x support. 15 16 * Source/WebKit.pri: 17 1 18 2011-05-04 Xan Lopez <xlopez@igalia.com> 2 19 -
trunk/Source/JavaScriptCore/ChangeLog
r85813 r85855 1 2011-05-05 Alexis Menard <alexis.menard@openbossa.org> 2 3 Reviewed by Benjamin Poulain. 4 5 [Qt] Make QtWebKit build when using gcc 4.6.0 6 https://bugs.webkit.org/show_bug.cgi?id=60265 7 8 If QtWebKit is compiled with gcc 4.6.0 or later we don't want to deactivate 9 the c++0x support because it works. 10 11 * JavaScriptCore.pro: 12 1 13 2011-05-04 Fridrich Strba <fridrich.strba@bluewin.ch> 2 14 -
trunk/Source/JavaScriptCore/JavaScriptCore.pro
r83626 r85855 218 218 } 219 219 220 # Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec 221 *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x 222 220 lessThan(QT_GCC_MAJOR_VERSION, 5):lessThan(QT_GCC_MINOR_VERSION, 6) { 221 # Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec. 222 *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x 223 } 224 -
trunk/Source/WebKit.pri
r83626 r85855 94 94 linux-g++* { 95 95 isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror 96 97 greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { 98 if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { 99 # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr). 100 QMAKE_CFLAGS += -Wno-c++0x-compat 101 QMAKE_CXXFLAGS += -Wno-c++0x-compat 102 } 103 } 96 104 } 97 105
Note: See TracChangeset
for help on using the changeset viewer.