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

Maintenance and Qt-4.7.x support

Browse Source 
[SVN r73300]
This commit is contained in:
Jürgen Hunold
2011-07-22 12:24:17 +00:00
parent a6af78ed2e
commit c3215e716a
6 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
v2/test/qt4/jamroot.jam
View File

@@ -39,9 +39,12 @@ if [ qt4.initialized ]
[ link phonon.cpp /qt//phonon ]
[ link qtmultimedia.cpp /qt//QtMultimedia ]
# QML
[ link qtdeclarative.cpp /qt//QtDeclarative ]
# Help systems.
[ link qthelp.cpp /qt//QtHelp ]
[ link qtassistant.cpp /qt//QtAssistantClient ]
[ link qtassistant.cpp /qt//QtAssistantClient : <conditional>@check_for_assistant ]
# Check working and disabled Qt3Support
[ link qt3support.cpp /qt//Qt3Support : <qt3support>on ]
@@ -56,3 +59,18 @@ if [ qt4.initialized ]
: # usage-requirements
;
}
# QtAssistant is removed from Qt >= 4.6
rule check_for_assistant ( properties * )
{
# Extract version number from toolset
local version = [ MATCH "<qt>([0-9.]+).*"
: $(properties) ] ;
if $(version) > "4.6.99"
{
result += <build>no ;
}
}

2
v2/test/qt4/phonon.cpp
View File

@@ -5,7 +5,7 @@
#define BOOST_TEST_MODULE QtPhonon
#include <Phonon/MediaObject>
#include <phonon/MediaObject>
#include <boost/test/unit_test.hpp>

27
v2/test/qt4/qtdeclarative.cpp Normal file
View File

@@ -0,0 +1,27 @@
// (c) Copyright Juergen Hunold 2011
// 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 QtMultimedia
#include <QApplication>
#include <QDeclarativeView>
#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_XML_LIB), true);
BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_DECLARATIVE_LIB), true);
}
BOOST_AUTO_TEST_CASE( declarative )
{
QApplication app(boost::unit_test::framework::master_test_suite().argc,
boost::unit_test::framework::master_test_suite().argv);
QDeclarativeView view;
}

2
v2/test/qt4/qtmultimedia.cpp
View File

@@ -18,7 +18,7 @@ BOOST_AUTO_TEST_CASE( defines)
BOOST_AUTO_TEST_CASE( audiodevices)
{
QList<QAudioDeviceId> devices = QAudioDeviceInfo::deviceList(QAudio::AudioOutput);
QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
for(int i = 0; i < devices.size(); ++i) {
BOOST_TEST_MESSAGE(QAudioDeviceInfo(devices.at(i)).deviceName().constData());
}

12
v2/test/qt4/qtscript.cpp
View File

@@ -7,6 +7,8 @@
#include <QScriptEngine>
#include <QCoreApplication>
#include <boost/test/unit_test.hpp>
#include <iostream>
@@ -25,9 +27,11 @@ BOOST_AUTO_TEST_CASE( defines)
BOOST_AUTO_TEST_CASE( script )
{
QScriptEngine myEngine;
QScriptValue three = myEngine.evaluate("1 + 2");
QCoreApplication app(boost::unit_test::framework::master_test_suite().argc,
boost::unit_test::framework::master_test_suite().argv);
QScriptEngine myEngine;
QScriptValue three = myEngine.evaluate("1 + 2");
BOOST_CHECK_EQUAL(three.toNumber(), 3);
BOOST_CHECK_EQUAL(three.toString(), QLatin1String("3"));
BOOST_CHECK_EQUAL(three.toNumber(), 3);
BOOST_CHECK_EQUAL(three.toString(), QLatin1String("3"));
}

15
v2/tools/qt4.jam
View File

@@ -415,6 +415,7 @@ rule init ( prefix : full_bin ? : full_inc ? : full_lib ? : version ? : conditio
# Qt designer library
add-shared-library QtDesigner : QtGui QtXml : : $(target-requirements) ;
add-shared-library QtDesignerComponents : QtGui QtXml : : $(target-requirements) ;
# Support for dynamic Widgets (Qt 4.1)
add-static-library QtUiTools : QtGui QtXml : $(target-requirements) ;
@@ -441,13 +442,19 @@ rule init ( prefix : full_bin ? : full_inc ? : full_lib ? : version ? : conditio
add-shared-library QtXmlPatterns : QtNetwork : QT_XMLPATTERNS_LIB : $(target-requirements) ;
# Help-Engine (Qt 4.4)
add-shared-library QtHelp : QtGui QtSql QtXml : : $(target-requirements) ;
add-shared-library QtHelp : QtGui QtSql QtXml : : $(target-requirements) ;
add-shared-library QtCLucene : QCore QtSql QtXml : : $(target-requirements) ;
# QML-Engine (Qt 4.7)
add-shared-library QtDeclarative : QtGui QtXml : : $(target-requirements) ;
# AssistantClient Support
# Compat library
# Compat library removed in 4.7.0
# Pre-4.4 help system, use QtHelp for new programs
add-shared-library QtAssistantClient : QtGui : : $(target-requirements) : QtAssistant ;
if $(version) < "4.7"
{
add-shared-library QtAssistantClient : QtGui : : $(target-requirements) : QtAssistant ;
}
debug-message "==== Configured Qt-$(version) ====" ;
project.pop-current ;