[Boost-commit] svn:boost r82847 - in branches/release: . tools tools/build/v2 tools/build/v2/test/qt5 tools/build/v2/tools

Subject: [Boost-commit] svn:boost r82847 - in branches/release: . tools tools/build/v2 tools/build/v2/test/qt5 tools/build/v2/tools
From: jhunold_at_[hidden]
Date: 2013-02-13 02:00:00

Author: jhunold
Date: 2013-02-13 01:59:58 EST (Wed, 13 Feb 2013)
New Revision: 82847
URL: http://svn.boost.org/trac/boost/changeset/82847

Log:
Merge 82654,82655 from ^/trunk

  ------------------------------------------------------------------------
  r82654 | jhunold | 2013-01-28 09:54:26 +0100 (Mo, 28 Jan 2013) | 3 lines
  
  Add support for QtWebkitWidgets. Fixes #7920
  
  Thanks to Frank Richter for the patch.
  ------------------------------------------------------------------------
  r82655 | jhunold | 2013-01-28 09:54:39 +0100 (Mo, 28 Jan 2013) | 1 line
  
  Fix QtTest test
  ------------------------------------------------------------------------

Added:
   branches/release/tools/build/v2/test/qt5/qtwebkit.cpp
      - copied unchanged from r82654, /trunk/tools/build/v2/test/qt5/qtwebkit.cpp
Properties modified: 
   branches/release/   (props changed)
   branches/release/tools/   (props changed)
   branches/release/tools/build/v2/   (props changed)
Text files modified: 
   branches/release/tools/build/v2/test/qt5/jamroot.jam         |     5 +++--                                   
   branches/release/tools/build/v2/test/qt5/qtwebkitwidgets.cpp |     4 ++--                                    
   branches/release/tools/build/v2/tools/qt5.jam                |     3 ++-                                     
   3 files changed, 7 insertions(+), 5 deletions(-)

Modified: branches/release/tools/build/v2/test/qt5/jamroot.jam
==============================================================================
--- branches/release/tools/build/v2/test/qt5/jamroot.jam	(original)
+++ branches/release/tools/build/v2/test/qt5/jamroot.jam	2013-02-13 01:59:58 EST (Wed, 13 Feb 2013)
@@ -36,13 +36,14 @@
       [ link qtwidgets.cpp /qt5//QtWidgets ]
 
       # Multimedia toolkits.
+      [ link qtwebkit.cpp /qt5//QtWebKit ]
       [ link qtwebkitwidgets.cpp /qt5//QtWebKitWidgets ]
       [ link qtmultimedia.cpp /qt5//QtMultimedia ]
 
       # QtQuick version1
       [ link qtdeclarative.cpp /qt5//QtDeclarative ]
 
-      # QtQuick version2 
+      # QtQuick version2
       [ run qtquick.cpp /qt5//QtQuick : : $(CWD)/qtquick.qml ]
 
       # Help systems.
@@ -50,7 +51,7 @@
 
       # Testing using QtTest. Simple sample
       # ToDo: better support for "automoc" aka '#include "qttest.moc"'
-      [ run qttest.cpp [ cast _ moccable-cpp : qttest.cpp ] /qt5//QtTest : : : <define>TEST_MOCK ]
+      [ run qttest.cpp [ cast _ moccable5-cpp : qttest.cpp ] /qt5//QtTest : : : <define>TEST_MOCK ]
 
       # Test moc rule
       [ run mock.cpp mock.h /qt5//QtCore : : : <define>TEST_MOCK ]

Modified: branches/release/tools/build/v2/test/qt5/qtwebkitwidgets.cpp
==============================================================================
--- branches/release/tools/build/v2/test/qt5/qtwebkitwidgets.cpp	(original)
+++ branches/release/tools/build/v2/test/qt5/qtwebkitwidgets.cpp	2013-02-13 01:59:58 EST (Wed, 13 Feb 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: branches/release/tools/build/v2/tools/qt5.jam
==============================================================================
--- branches/release/tools/build/v2/tools/qt5.jam	(original)
+++ branches/release/tools/build/v2/tools/qt5.jam	2013-02-13 01:59:58 EST (Wed, 13 Feb 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) ;