Changeset 82125 in webkit


Ignore:
Timestamp:
Mar 28, 2011 9:29:08 AM (13 years ago)
Author:
benjamin.poulain@nokia.com
Message:

2011-03-28 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Andreas Kling.

[Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
​https://bugs.webkit.org/show_bug.cgi?id=57087

Enable QT_ASCII_CAST_WARNINGS by default in webkit.pri to catch the errors early on.

  • Source/WebKit.pri:

2011-03-28 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Andreas Kling.

[Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
​https://bugs.webkit.org/show_bug.cgi?id=57087

  • QtWebKit.pro: we can now enable QT_ASCII_CAST_WARNINGS
  • tests/tests.pri: we do not require QT_ASCII_CAST_WARNINGS for tests since they are applications, not libraries.

2011-03-28 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Andreas Kling.

[Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
​https://bugs.webkit.org/show_bug.cgi?id=57087

Disable QT_ASCII_CAST_WARNINGS for applications.

  • DumpRenderTree/qt/DumpRenderTree.pro:
  • DumpRenderTree/qt/ImageDiff.pro:
  • DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
  • MiniBrowser/qt/MiniBrowser.pro:
  • QtTestBrowser/QtTestBrowser.pro:
  • WebKitTestRunner/qt/WebKitTestRunner.pro:
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r82030 r82125  
     12011-03-28  Benjamin Poulain  <benjamin.poulain@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
     6        https://bugs.webkit.org/show_bug.cgi?id=57087
     7
     8        Enable QT_ASCII_CAST_WARNINGS by default in webkit.pri to catch the errors early on.
     9
     10        * Source/WebKit.pri:
     11
    1122011-03-26  Adam Barth  <abarth@webkit.org>
    213

  • trunk/Source/WebKit.pri

    r80796 r82125  
    7373    $$OUTPUT_DIR/include \
    7474    $$QT.script.includes
     75
     76DEFINES += QT_ASCII_CAST_WARNINGS
    7577
    7678webkit2:INCLUDEPATH *= $$OUTPUT_DIR/include/WebKit2

  • trunk/Source/WebKit/qt/ChangeLog

    r82115 r82125  
     12011-03-28  Benjamin Poulain  <benjamin.poulain@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
     6        https://bugs.webkit.org/show_bug.cgi?id=57087
     7
     8        * QtWebKit.pro: we can now enable QT_ASCII_CAST_WARNINGS
     9        * tests/tests.pri: we do not require QT_ASCII_CAST_WARNINGS for tests
     10        since they are applications, not libraries.
     11
    1122011-03-28  Andras Becsi  <abecsi@webkit.org>
    213

  • trunk/Source/WebKit/qt/QtWebKit.pro

    r82115 r82125  
    8888}
    8989
    90 # Avoid ASCII-cast warnings because Qt use them a lot and warnings are treated as errors.
    91 DEFINES -= QT_ASCII_CAST_WARNINGS
    9290
    9391symbian {

  • trunk/Source/WebKit/qt/tests/tests.pri

    r79678 r82125  
    3333!symbian: DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
    3434
     35DEFINES -= QT_ASCII_CAST_WARNINGS
     36

  • trunk/Tools/ChangeLog

    r82109 r82125  
     12011-03-28  Benjamin Poulain  <benjamin.poulain@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
     6        https://bugs.webkit.org/show_bug.cgi?id=57087
     7
     8        Disable QT_ASCII_CAST_WARNINGS for applications.
     9
     10        * DumpRenderTree/qt/DumpRenderTree.pro:
     11        * DumpRenderTree/qt/ImageDiff.pro:
     12        * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
     13        * MiniBrowser/qt/MiniBrowser.pro:
     14        * QtTestBrowser/QtTestBrowser.pro:
     15        * WebKitTestRunner/qt/WebKitTestRunner.pro:
     16
    1172011-03-28  Andreas Kling  <kling@webkit.org>
    218

  • trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro

    r76496 r82125  
    5252
    5353DEFINES += USE_SYSTEM_MALLOC=1
     54DEFINES -= QT_ASCII_CAST_WARNINGS

  • trunk/Tools/DumpRenderTree/qt/ImageDiff.pro

    r76525 r82125  
    1515}
    1616
     17DEFINES -= QT_ASCII_CAST_WARNINGS

  • trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro

    r81157 r82125  
    4848}
    4949
     50DEFINES -= QT_ASCII_CAST_WARNINGS
     51
    5052!win32:!embedded:!mac:!symbian {
    5153    LIBS += -lX11

  • trunk/Tools/MiniBrowser/qt/MiniBrowser.pro

    r79446 r82125  
    5757}
    5858
     59DEFINES -= QT_ASCII_CAST_WARNINGS
     60
    5961# We copy the resource file to the build directory.
    6062# The copier is defined in Tools/MiniBrowser/DerivedSources.pro.

  • trunk/Tools/QtTestBrowser/QtTestBrowser.pro

    r81139 r82125  
    6363}
    6464
     65DEFINES -= QT_ASCII_CAST_WARNINGS
     66
    6567RESOURCES += \
    6668    QtTestBrowser.qrc

  • trunk/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro

    r79999 r82125  
    1010
    1111DEFINES += USE_SYSTEM_MALLOC=1
     12DEFINES -= QT_ASCII_CAST_WARNINGS
    1213
    1314INCLUDEPATH += \
Note: See TracChangeset for help on using the changeset viewer.