[Boost-commit] svn:boost r82654 - in trunk/tools/build/v2: test/qt5 tools

Subject: [Boost-commit] svn:boost r82654 - in trunk/tools/build/v2: test/qt5 tools
From: jhunold_at_[hidden]
Date: 2013-01-28 03:54:26

Author: jhunold
Date: 2013-01-28 03:54:26 EST (Mon, 28 Jan 2013)
New Revision: 82654
URL: http://svn.boost.org/trac/boost/changeset/82654

Log:
Add support for QtWebkitWidgets. Fixes #7920

Thanks to Frank Richter for the patch.
Added:
   trunk/tools/build/v2/test/qt5/qtwebkit.cpp
      - copied, changed from r82652, /trunk/tools/build/v2/test/qt5/qtwebkitwidgets.cpp
Text files modified: 
   trunk/tools/build/v2/test/qt5/jamroot.jam         |     1 +                                       
   trunk/tools/build/v2/test/qt5/qtwebkit.cpp        |     5 ++---                                   
   trunk/tools/build/v2/test/qt5/qtwebkitwidgets.cpp |     4 ++--                                    
   trunk/tools/build/v2/tools/qt5.jam                |     3 ++-                                     
   4 files changed, 7 insertions(+), 6 deletions(-)

Modified: trunk/tools/build/v2/test/qt5/jamroot.jam
==============================================================================
--- trunk/tools/build/v2/test/qt5/jamroot.jam	(original)
+++ trunk/tools/build/v2/test/qt5/jamroot.jam	2013-01-28 03:54:26 EST (Mon, 28 Jan 2013)
@@ -36,6 +36,7 @@
       [ link qtwidgets.cpp /qt5//QtWidgets ]
 
       # Multimedia toolkits.
+      [ link qtwebkit.cpp /qt5//QtWebKit ]
       [ link qtwebkitwidgets.cpp /qt5//QtWebKitWidgets ]
       [ link qtmultimedia.cpp /qt5//QtMultimedia ]
 

Copied: trunk/tools/build/v2/test/qt5/qtwebkit.cpp (from r82652, /trunk/tools/build/v2/test/qt5/qtwebkitwidgets.cpp)
==============================================================================
--- /trunk/tools/build/v2/test/qt5/qtwebkitwidgets.cpp	(original)
+++ trunk/tools/build/v2/test/qt5/qtwebkit.cpp	2013-01-28 03:54:26 EST (Mon, 28 Jan 2013)
@@ -5,7 +5,7 @@
 
 #define BOOST_TEST_MODULE QtWebKit
 
-#include <QWebPage>
+#include <QWebSettings>
 
 #include <boost/test/unit_test.hpp>
 
@@ -18,6 +18,5 @@
 
 BOOST_AUTO_TEST_CASE( webkit )
 {
-    QWebPage page;
-    BOOST_CHECK_EQUAL(page.isModified(), false);
+    BOOST_CHECK(QWebSettings::globalSettings());
 }

Modified: trunk/tools/build/v2/test/qt5/qtwebkitwidgets.cpp
==============================================================================
--- trunk/tools/build/v2/test/qt5/qtwebkitwidgets.cpp	(original)
+++ trunk/tools/build/v2/test/qt5/qtwebkitwidgets.cpp	2013-01-28 03:54:26 EST (Mon, 28 Jan 2013)
@@ -3,7 +3,7 @@
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_TEST_MODULE QtWebKit
+#define BOOST_TEST_MODULE QtWebKitWidgets
 
 #include <QWebPage>
 
@@ -13,7 +13,7 @@
 {
     BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_CORE_LIB), true);
     BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_GUI_LIB), true);
-    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_WEBKIT_LIB), true);
+    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_WEBKITWIDGETS_LIB), true);
 }
 
 BOOST_AUTO_TEST_CASE( webkit )

Modified: trunk/tools/build/v2/tools/qt5.jam
==============================================================================
--- trunk/tools/build/v2/tools/qt5.jam	(original)
+++ trunk/tools/build/v2/tools/qt5.jam	2013-01-28 03:54:26 EST (Mon, 28 Jan 2013)
@@ -428,7 +428,8 @@
     add-shared-library QtScriptTools : QtScript : QT_SCRIPTTOOLS_LIB : $(target-requirements) ;
 
     # WebKit
-    add-shared-library QtWebKitWidgets : QtGui : QT_WEBKIT_LIB : $(target-requirements) ;
+    add-shared-library QtWebKit        : QtGui : QT_WEBKIT_LIB : $(target-requirements) ;
+    add-shared-library QtWebKitWidgets : QtGui : QT_WEBKITWIDGETS_LIB : $(target-requirements) ;
 
     # Multimedia engine
     add-shared-library QtMultimedia : QtGui : QT_MULTIMEDIA_LIB : $(target-requirements) ;