Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/qt4/patches/qt-4.8.1-webkit-no-werror.patch

    Annotation of /trunk/qt4/patches/qt-4.8.1-webkit-no-werror.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1772 - (hide annotations) (download)
    Wed May 9 08:15:47 2012 UTC (12 years, 1 month ago) by niro
    File size: 908 byte(s) 
    -disable -werror with webkit
    1 niro 1772 diff -up qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri
    2     --- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-03-14 15:01:29.000000000 +0100
    3     +++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri 2012-03-28 17:12:33.391294004 +0200
    4     @@ -102,8 +102,6 @@ CONFIG -= warn_on
    5    
    6     # Treat warnings as errors on x86/Linux/GCC
    7     linux-g++* {
    8     - !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
    9     -
    10     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
    11     if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
    12     # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).