Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits)
  mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf
  mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly
  mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior
  configure: Deal with multiple redefinitions of qmake variables
  Split QScriptValue::call autotest into smaller tests.
  Optimize and clean up QClipData::fixup()
  There is no predefined qmake x11 scope for x11 builds.
  Refactor tst_QScriptContext::throwError test.
  Fixed whitespace.
  Don't use scopes in mkspecs as configure does not support them
  Fixed destination path for the S60 feedback plugin.
  Don't put Objective-C sources in SOURCES
  Fix regression in tst_maketestselftest::naming_convention.
  Split monolithic QScriptEngine autotests into smaller tests
  Add SunSpider and V8 benchmarks to benchmarks/script.pro
  Push and pop the thread-default context for the current thread
  Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.
  Import SunSpider benchmarks for QtScript
  Import V8 benchmarks for QtScript
  Add more microbenchmarks for QScriptValue
  ...

1 files changed, 167 insertions, 0 deletions

diff --git a/tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp b/tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp
new file mode 100644
index 0000000..e8b5e0a
--- /dev/null
+++ b/tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp
@@ -0,0 +1,167 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+
+#include <QtScript/qscriptengine.h>
+
+//TESTED_CLASS=
+//TESTED_FILES=
+
+class tst_QScriptExtensionPlugin : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QScriptExtensionPlugin();
+    virtual ~tst_QScriptExtensionPlugin();
+
+private slots:
+    void importSimplePlugin();
+    void importStaticPlugin();
+};
+
+tst_QScriptExtensionPlugin::tst_QScriptExtensionPlugin()
+{
+}
+
+tst_QScriptExtensionPlugin::~tst_QScriptExtensionPlugin()
+{
+}
+
+void tst_QScriptExtensionPlugin::importSimplePlugin()
+{
+    QScriptEngine eng;
+    QCoreApplication::addLibraryPath("plugins");
+
+    QVERIFY(eng.importedExtensions().isEmpty());
+
+    QStringList available = eng.availableExtensions();
+    QVERIFY(available.contains("simple"));
+    QVERIFY(available.contains("simple.foo"));
+    QVERIFY(available.contains("simple.foo.bar"));
+
+    QScriptValue extensionObject;
+    {
+        QVERIFY(eng.importExtension("simple").isUndefined());
+        QCOMPARE(eng.importedExtensions().size(), 1);
+        QCOMPARE(eng.importedExtensions().at(0), QString::fromLatin1("simple"));
+        QVERIFY(eng.availableExtensions().contains("simple"));
+        QVERIFY(eng.globalObject().property("pluginKey").equals("simple"));
+        QVERIFY(eng.globalObject().property("package").isObject());
+        extensionObject = eng.globalObject().property("simple");
+        QVERIFY(extensionObject.isObject());
+        QVERIFY(extensionObject.equals(eng.globalObject().property("package")));
+    }
+
+    {
+        QVERIFY(eng.importExtension("simple.foo").isUndefined());
+        QCOMPARE(eng.importedExtensions().size(), 2);
+        QCOMPARE(eng.importedExtensions().at(1), QString::fromLatin1("simple.foo"));
+        QVERIFY(eng.availableExtensions().contains("simple.foo"));
+        QVERIFY(eng.globalObject().property("pluginKey").equals("simple.foo"));
+        QVERIFY(eng.globalObject().property("package").isObject());
+        QVERIFY(!extensionObject.equals(eng.globalObject().property("package")));
+        QVERIFY(extensionObject.equals(eng.globalObject().property("simple")));
+        QVERIFY(extensionObject.property("foo").isObject());
+        QVERIFY(extensionObject.property("foo").equals(eng.globalObject().property("package")));
+    }
+
+    {
+        QVERIFY(eng.importExtension("simple.foo.bar").isUndefined());
+        QCOMPARE(eng.importedExtensions().size(), 3);
+        QCOMPARE(eng.importedExtensions().at(2), QString::fromLatin1("simple.foo.bar"));
+        QVERIFY(eng.availableExtensions().contains("simple.foo.bar"));
+        QVERIFY(eng.globalObject().property("pluginKey").equals("simple.foo.bar"));
+        QVERIFY(eng.globalObject().property("package").isObject());
+        QVERIFY(!extensionObject.equals(eng.globalObject().property("package")));
+        QVERIFY(extensionObject.equals(eng.globalObject().property("simple")));
+        QVERIFY(extensionObject.property("foo").property("bar").isObject());
+        QVERIFY(extensionObject.property("foo").property("bar").equals(eng.globalObject().property("package")));
+    }
+
+    // Extensions can't be imported multiple times.
+    eng.globalObject().setProperty("pluginKey", QScriptValue());
+    QVERIFY(eng.importExtension("simple").isUndefined());
+    QCOMPARE(eng.importedExtensions().size(), 3);
+    QVERIFY(!eng.globalObject().property("pluginKey").isValid());
+
+    QVERIFY(eng.importExtension("simple.foo").isUndefined());
+    QCOMPARE(eng.importedExtensions().size(), 3);
+    QVERIFY(!eng.globalObject().property("pluginKey").isValid());
+
+    QVERIFY(eng.importExtension("simple.foo.bar").isUndefined());
+    QCOMPARE(eng.importedExtensions().size(), 3);
+    QVERIFY(!eng.globalObject().property("pluginKey").isValid());
+}
+
+void tst_QScriptExtensionPlugin::importStaticPlugin()
+{
+    Q_INIT_RESOURCE(staticplugin);
+    QScriptEngine eng;
+    QVERIFY(eng.availableExtensions().contains("static"));
+    QVERIFY(eng.importExtension("static").isUndefined());
+    QCOMPARE(eng.importedExtensions().size(), 1);
+    QCOMPARE(eng.importedExtensions().at(0), QString::fromLatin1("static"));
+    QVERIFY(eng.availableExtensions().contains("static"));
+    QVERIFY(eng.globalObject().property("pluginKey").equals("static"));
+
+    // Verify that :/qtscriptextension/static/__init__.js was evaluated.
+    QVERIFY(eng.evaluate("spy").isObject());
+    QVERIFY(eng.evaluate("spy.extension").equals("static"));
+    QVERIFY(eng.evaluate("spy.setupPackage").isFunction());
+    QVERIFY(eng.evaluate("spy.postInit").isUndefined());
+
+    QVERIFY(eng.evaluate("postInitWasCalled").isBool());
+    QVERIFY(eng.evaluate("postInitWasCalled").toBool());
+
+    // Extensions can't be imported multiple times.
+    eng.globalObject().setProperty("pluginKey", QScriptValue());
+    QVERIFY(eng.importExtension("static").isUndefined());
+    QCOMPARE(eng.importedExtensions().size(), 1);
+    QVERIFY(!eng.globalObject().property("pluginKey").isValid());
+}
+
+Q_IMPORT_PLUGIN(staticplugin)
+
+QTEST_MAIN(tst_QScriptExtensionPlugin)
+#include "tst_qscriptextensionplugin.moc"