boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 12:42:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge 82654,82655 from ^/trunk

Browse Source 
------------------------------------------------------------------------
  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
  ------------------------------------------------------------------------


[SVN r82847]
This commit is contained in:
Jürgen Hunold
2013-02-13 06:59:58 +00:00
parent 374bd44c04
commit 0b0a10b753
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
v2/test/qt5/jamroot.jam
View File

@@ -36,13 +36,14 @@ if [ qt5.initialized ]
[ 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 @@ if [ qt5.initialized ]
# 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 ]

22
v2/test/qt5/qtwebkit.cpp Normal file
View File

@@ -0,0 +1,22 @@
// (c) Copyright Juergen Hunold 2012
// Use, modification and distribution is subject to the Boost Software
// 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
#include <QWebSettings>
#include <boost/test/unit_test.hpp>
BOOST_AUTO_TEST_CASE( defines)
{
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_AUTO_TEST_CASE( webkit )
{
BOOST_CHECK(QWebSettings::globalSettings());
}

4
v2/test/qt5/qtwebkitwidgets.cpp
View File

@@ -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_AUTO_TEST_CASE( defines)
{
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 )

3
v2/tools/qt5.jam
View File

@@ -428,7 +428,8 @@ rule init ( prefix : version ? : condition * : namespace ? : infix ? : full_bin
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) ;