Ticket #7920: qt5-webkitlibs.diff

File qt5-webkitlibs.diff, 3.3 KB (added by frank.richter@…, 10 years ago)

Provide access to both QtWebKit and QtWebKitWidgets in /qt5

  • tools/build/v2/test/qt5/jamroot.jam 

    diff -urP -x bin.v2 boost_1_53_0_beta1.org/tools/build/v2/test/qt5/jamroot.jam boost_1_53_0_beta1/tools/build/v2/test/qt5/jamroot.jam
    old new  
    3636      [ link qtwidgets.cpp /qt5//QtWidgets ]
    3737
    3838      # Multimedia toolkits.
     39      [ link qtwebkit.cpp /qt5//QtWebKit ]
    3940      [ link qtwebkitwidgets.cpp /qt5//QtWebKitWidgets ]
    4041      [ link qtmultimedia.cpp /qt5//QtMultimedia ]
    4142

  • tools/build/v2/test/qt5/qtwebkit.cpp 

    diff -urP -x bin.v2 boost_1_53_0_beta1.org/tools/build/v2/test/qt5/qtwebkit.cpp boost_1_53_0_beta1/tools/build/v2/test/qt5/qtwebkit.cpp
    old new  
     1// (c) Copyright Juergen Hunold 2012
     2// Use, modification and distribution is subject to the Boost Software
     3// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
     4// http://www.boost.org/LICENSE_1_0.txt)
     5
     6#define BOOST_TEST_MODULE QtWebKit
     7
     8#include <QWebSettings>
     9
     10#include <boost/test/unit_test.hpp>
     11
     12BOOST_AUTO_TEST_CASE( defines)
     13{
     14    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_CORE_LIB), true);
     15    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_GUI_LIB), true);
     16    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_WEBKIT_LIB), true);
     17}
     18
     19BOOST_AUTO_TEST_CASE( webkit )
     20{
     21    BOOST_CHECK(QWebSettings::globalSettings());
     22}

  • tools/build/v2/test/qt5/qtwebkitwidgets.cpp 

    diff -urP -x bin.v2 boost_1_53_0_beta1.org/tools/build/v2/test/qt5/qtwebkitwidgets.cpp boost_1_53_0_beta1/tools/build/v2/test/qt5/qtwebkitwidgets.cpp
    old new  
    33// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
    44// http://www.boost.org/LICENSE_1_0.txt)
    55
    6 #define BOOST_TEST_MODULE QtWebKit
     6#define BOOST_TEST_MODULE QtWebKitWidgets
    77
    88#include <QWebPage>
    99
    … …  
    1313{
    1414    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_CORE_LIB), true);
    1515    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_GUI_LIB), true);
    16     BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_WEBKIT_LIB), true);
     16    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_WEBKITWIDGETS_LIB), true);
    1717}
    1818
    19 BOOST_AUTO_TEST_CASE( webkit )
     19BOOST_AUTO_TEST_CASE( webkitwidgets )
    2020{
    2121    QWebPage page;
    2222    BOOST_CHECK_EQUAL(page.isModified(), false);

  • tools/build/v2/tools/qt5.jam 

    diff -urP -x bin.v2 boost_1_53_0_beta1.org/tools/build/v2/tools/qt5.jam boost_1_53_0_beta1/tools/build/v2/tools/qt5.jam
    old new  
    428428    add-shared-library QtScriptTools : QtScript : QT_SCRIPTTOOLS_LIB : $(target-requirements) ;
    429429
    430430    # WebKit
    431     add-shared-library QtWebKitWidgets : QtGui : QT_WEBKIT_LIB : $(target-requirements) ;
     431    add-shared-library QtWebKit        : QtGui : QT_WEBKIT_LIB : $(target-requirements) ;
     432    add-shared-library QtWebKitWidgets : QtGui : QT_WEBKITWIDGETS_LIB : $(target-requirements) ;
    432433
    433434    # Multimedia engine
    434435    add-shared-library QtMultimedia : QtGui : QT_MULTIMEDIA_LIB : $(target-requirements) ;