From daaa7260f19252003eb61b82a31a3d4a05f04602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Hunold?= <jhunold@gmx.eu>
Date: Tue, 17 Feb 2009 19:30:19 +0000
Subject: [PATCH] Add support for QtScriptTools (Qt-4.5)

[SVN r51300]
---
 v2/test/qt4/jamroot.jam       |  1 +
 v2/test/qt4/qtscript.cpp      |  3 +--
 v2/test/qt4/qtscripttools.cpp | 47 +++++++++++++++++++++++++++++++++++
 v2/tools/qt4.jam              |  5 +++-
 4 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 v2/test/qt4/qtscripttools.cpp

diff --git a/v2/test/qt4/jamroot.jam b/v2/test/qt4/jamroot.jam
index 6770012b0..0746b91d1 100644
--- a/v2/test/qt4/jamroot.jam
+++ b/v2/test/qt4/jamroot.jam
@@ -27,6 +27,7 @@ if [ qt4.initialized ]
       [ run qtxml.cpp  /qt//QtXml  ]   
       [ run qtnetwork.cpp /qt//QtNetwork ]
       [ run qtscript.cpp  /qt//QtScript  ]
+      [ run qtscripttools.cpp  /qt//QtScriptTools  ]
       [ run qtxmlpatterns.cpp  /qt//QtXmlPatterns  ]
     
       # ToDo: runable example code
diff --git a/v2/test/qt4/qtscript.cpp b/v2/test/qt4/qtscript.cpp
index 275eb4ff2..20528365b 100644
--- a/v2/test/qt4/qtscript.cpp
+++ b/v2/test/qt4/qtscript.cpp
@@ -20,7 +20,7 @@ operator << (std::ostream& stream, QString const& string)
 
 BOOST_AUTO_TEST_CASE( defines)
 {
-    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_CORE_LIB), true);
+    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_SCRIPT_LIB), true);
 }
 
 BOOST_AUTO_TEST_CASE( script )
@@ -30,5 +30,4 @@ BOOST_AUTO_TEST_CASE( script )
 
    BOOST_CHECK_EQUAL(three.toNumber(), 3);
    BOOST_CHECK_EQUAL(three.toString(), QLatin1String("3"));
-
 }
diff --git a/v2/test/qt4/qtscripttools.cpp b/v2/test/qt4/qtscripttools.cpp
new file mode 100644
index 000000000..4d0b7f256
--- /dev/null
+++ b/v2/test/qt4/qtscripttools.cpp
@@ -0,0 +1,47 @@
+// (c) Copyright Juergen Hunold 2009
+// 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 QtScriptTools
+
+#include <QScriptEngine>
+
+#include <QScriptEngineDebugger>
+
+#include <QApplication>
+
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+
+namespace utf = boost::unit_test::framework;
+
+std::ostream&
+operator << (std::ostream& stream, QString const& string)
+{
+    stream << qPrintable(string);
+    return stream;
+}
+
+BOOST_AUTO_TEST_CASE( defines)
+{
+    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_SCRIPTTOOLS_LIB), true);
+}
+
+BOOST_AUTO_TEST_CASE( script )
+{
+   QApplication app(utf::master_test_suite().argc,
+                    utf::master_test_suite().argv);
+
+   QScriptEngine myEngine;
+   QScriptValue three = myEngine.evaluate("1 + 2");
+
+   QScriptEngineDebugger debugger;
+   debugger.attachTo(&myEngine);
+
+   BOOST_CHECK_EQUAL(three.toNumber(), 3);
+   BOOST_CHECK_EQUAL(three.toString(), QLatin1String("3"));
+
+   debugger.detach();
+}
diff --git a/v2/tools/qt4.jam b/v2/tools/qt4.jam
index f8a9dbe75..4857d8e4c 100644
--- a/v2/tools/qt4.jam
+++ b/v2/tools/qt4.jam
@@ -423,7 +423,10 @@ rule init ( prefix : full_bin ? : full_inc ? : full_lib ? : version ? : conditio
     add-shared-library QtDBus : QtXml : : $(target-requirements) ;
 
     # Script-Engine (Qt 4.3)
-    add-shared-library QtScript : QtGui QtXml : : $(target-requirements) ;
+    add-shared-library QtScript : QtGui QtXml : QT_SCRIPT_LIB : $(target-requirements) ;
+
+    # Tools for the Script-Engine (Qt 4.5)
+    add-shared-library QtScriptTools : QtScript : QT_SCRIPTTOOLS_LIB : $(target-requirements) ;
 
     # WebKit (Qt 4.4)
     add-shared-library QtWebKit : QtGui : QT_WEBKIT_LIB : $(target-requirements) ;