Remove V8 submodule from QtDeclarative

QtDeclarative should now link against the QtV8 library
from qtbase.

The patch files have been moved to qtbase as well.

Applications that use the QtDeclarative private headers
may need to add the following to their .pro file:

QT += v8-private

This ensures that <private/v8.h> is found, which is
(indirectly) included by many QtDeclarative private
headers.

Task-number: QTBUG-20963

Change-Id: I31e973a6fcc0c416d3b258a61c26564cee3dcd4b
Reviewed-on: http://codereview.qt.nokia.com/3093
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

7 files changed, 0 insertions, 435 deletions

diff --git a/tests/auto/declarative/v8/Makefile.nonqt b/tests/auto/declarative/v8/Makefile.nonqt
deleted file mode 100644
index 7ab695ba6a..0000000000
--- a/tests/auto/declarative/v8/Makefile.nonqt
+++ /dev/null
@@ -1,11 +0,0 @@
-release-m32:
-	g++ -o v8test_release_m32 -m32 -O2 v8main.cpp v8test.cpp -lpthread -L../../../../src/3rdparty/v8/ -lv8
-
-debug-m32:
-	g++ -o v8test_debug_m32 -m32 -g v8main.cpp v8test.cpp -lpthread -L../../../../src/3rdparty/v8/ -lv8_g
-
-release:
-	g++ -o v8test_release -O2 v8main.cpp v8test.cpp -lpthread -L../../../../src/3rdparty/v8/ -lv8
-
-debug:
-	g++ -o v8test_debug -g v8main.cpp v8test.cpp -lpthread -L../../../../src/3rdparty/v8/ -lv8_g
diff --git a/tests/auto/declarative/v8/README.txt b/tests/auto/declarative/v8/README.txt
deleted file mode 100644
index a5df6201be..0000000000
--- a/tests/auto/declarative/v8/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-The v8 tests are actually implemented in v8test.[h|cpp].  There are also QtTest
-(tst_v8.cpp) and non-Qt (v8main.cpp) stubs provided to run these tests.  This
-is done to allow the tests to be run both in the Qt CI system, and manually 
-without a build of Qt.  The latter is necessary to run them against more exotic
-build of V8, like the ARM simulator.
-
-To build the non-Qt version of the tests, first build a debug or release V8 
-library under src/3rdparty/v8 using scons, and then use the Makefile.nonqt
-makefile selecting one of the following targets:
-    release: Build the tests with -O2 and link against libv8
-    debug: Build the tests with -g and link against libv8_g
-    release-m32: Build the tests with -O2 -m32 and link against libv8
-    debug-m32: Build the tests with -g -m32 and link against libv8_g
diff --git a/tests/auto/declarative/v8/tst_v8.cpp b/tests/auto/declarative/v8/tst_v8.cpp
deleted file mode 100644
index 32d100e968..0000000000
--- a/tests/auto/declarative/v8/tst_v8.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include "v8test.h"
-
-using namespace v8;
-
-class tst_v8 : public QObject
-{
-    Q_OBJECT
-public:
-    tst_v8() {}
-
-private slots:
-    void initTestCase() {}
-    void cleanupTestCase() {}
-
-    void eval();
-    void userobjectcompare();
-};
-
-void tst_v8::eval()
-{
-    QVERIFY(v8test_eval());
-}
-
-void tst_v8::userobjectcompare()
-{
-    QVERIFY(v8test_userobjectcompare());
-}
-
-int main(int argc, char *argv[]) 
-{ 
-    V8::SetFlagsFromCommandLine(&argc, argv, true);
-
-    QCoreApplication app(argc, argv); 
-    tst_v8 tc; 
-    return QTest::qExec(&tc, argc, argv); 
-}
-
-#include "tst_v8.moc"
diff --git a/tests/auto/declarative/v8/v8.pro b/tests/auto/declarative/v8/v8.pro
deleted file mode 100644
index bd6dfa9d5c..0000000000
--- a/tests/auto/declarative/v8/v8.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-load(qttest_p4)
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_v8.cpp v8test.cpp
-HEADERS += v8test.h
-
-CONFIG += parallel_test
-
-QT += declarative
-DEFINES += USING_V8_SHARED
diff --git a/tests/auto/declarative/v8/v8main.cpp b/tests/auto/declarative/v8/v8main.cpp
deleted file mode 100644
index 5930f53f90..0000000000
--- a/tests/auto/declarative/v8/v8main.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "v8test.h"
-#include <stdio.h>
-
-#define RUN_TEST(testname) { \
-    if (!v8test_ ## testname()) \
-        printf ("Test %s FAILED\n", # testname); \
-} 
-
-int main(int argc, char *argv[])
-{
-    v8::V8::SetFlagsFromCommandLine(&argc, argv, true);
-
-    RUN_TEST(eval);
-    RUN_TEST(userobjectcompare);
-
-    return -1;
-}
diff --git a/tests/auto/declarative/v8/v8test.cpp b/tests/auto/declarative/v8/v8test.cpp
deleted file mode 100644
index 27d39c5970..0000000000
--- a/tests/auto/declarative/v8/v8test.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "v8test.h"
-
-using namespace v8;
-
-#define BEGINTEST() bool _testPassed = true;
-#define ENDTEST() return _testPassed;
-
-#define VERIFY(expr) { \
-    if (!(expr)) { \
-        fprintf(stderr, "FAIL: %s:%d %s\n", __FILE__, __LINE__, # expr); \
-        _testPassed = false; \
-        goto cleanup; \
-    }  \
-}
-
-
-bool v8test_eval()
-{
-    BEGINTEST();
-
-    HandleScope handle_scope;
-    Persistent<Context> context = Context::New();
-    Context::Scope context_scope(context);
-
-    Local<Object> qmlglobal = Object::New();
-    qmlglobal->Set(String::New("a"), Integer::New(1922));
-
-    Local<Script> script = Script::Compile(String::New("eval(\"a\")"), NULL, NULL, 
-                                           Handle<String>(), Script::QmlMode);
-    
-    TryCatch tc;
-    Local<Value> result = script->Run(qmlglobal);
-
-    VERIFY(!tc.HasCaught());
-    VERIFY(result->Int32Value() == 1922);
-
-cleanup:
-    context.Dispose();
-
-    ENDTEST();
-}
-
-static int userObjectComparisonCalled = 0;
-static bool userObjectComparisonReturn = false;
-static Local<Object> expectedLhs;
-static Local<Object> expectedRhs;
-static bool expectedObjectsCompared = false;
-
-#define SET_EXPECTED(lhs, rhs) { \
-    expectedObjectsCompared = false; \
-    expectedLhs = lhs; \
-    expectedRhs = rhs; \
-}
-
-static bool UserObjectComparison(Local<Object> lhs, Local<Object> rhs)
-{
-    userObjectComparisonCalled++;
-
-    expectedObjectsCompared = (lhs == expectedLhs && rhs == expectedRhs);
-
-    return userObjectComparisonReturn;
-}
-
-inline bool runscript(const char *source) {
-    Local<Script> script = Script::Compile(String::New(source));
-    Local<Value> result = script->Run();
-    return result->BooleanValue();
-}
-
-bool v8test_userobjectcompare()
-{
-    BEGINTEST();
-
-    HandleScope handle_scope;
-    Persistent<Context> context = Context::New();
-    Context::Scope context_scope(context);
-
-    V8::SetUserObjectComparisonCallbackFunction(UserObjectComparison);
-
-    Local<ObjectTemplate> ot = ObjectTemplate::New();
-    ot->MarkAsUseUserObjectComparison();
-
-    Local<Object> uoc1 = ot->NewInstance();
-    Local<Object> uoc2 = ot->NewInstance();
-    context->Global()->Set(String::New("uoc1a"), uoc1);
-    context->Global()->Set(String::New("uoc1b"), uoc1);
-    context->Global()->Set(String::New("uoc2"), uoc2);
-    Local<Object> obj1 = Object::New();
-    context->Global()->Set(String::New("obj1a"), obj1);
-    context->Global()->Set(String::New("obj1b"), obj1);
-    context->Global()->Set(String::New("obj2"), Object::New());
-    Local<String> string1 = String::New("Hello World");
-    context->Global()->Set(String::New("string1a"), string1);
-    context->Global()->Set(String::New("string1b"), string1);
-    context->Global()->Set(String::New("string2"), v8::String::New("Goodbye World"));
-
-    // XXX Opportunity for optimization - don't invoke user callback if objects are
-    // equal.  
-#if 0
-    userObjectComparisonCalled = 0; userObjectComparisonReturn = false;
-    VERIFY(true == runscript("uoc1a == uoc1b"));
-    VERIFY(userObjectComparisonCalled == 0);
-#endif
-
-    // Comparing two uoc objects invokes uoc
-    userObjectComparisonCalled = 0; 
-    userObjectComparisonReturn = false;
-    VERIFY(false == runscript("uoc1a == uoc2"));
-    VERIFY(userObjectComparisonCalled == 1);
-
-    VERIFY(false == runscript("uoc2 == uoc1a"));
-    VERIFY(userObjectComparisonCalled == 2);
-    userObjectComparisonReturn = true;
-    VERIFY(true == runscript("uoc1a == uoc2"));
-    VERIFY(userObjectComparisonCalled == 3);
-    VERIFY(true == runscript("uoc2 == uoc1a"));
-    VERIFY(userObjectComparisonCalled == 4);
-
-    // != on two uoc object invokes uoc
-    userObjectComparisonCalled = 0; 
-    userObjectComparisonReturn = false;
-    VERIFY(true == runscript("uoc1a != uoc2"));
-    VERIFY(userObjectComparisonCalled == 1);
-    VERIFY(true == runscript("uoc2 != uoc1a"));
-    VERIFY(userObjectComparisonCalled == 2);
-    userObjectComparisonReturn = true;
-    VERIFY(false == runscript("uoc1a != uoc2"));
-    VERIFY(userObjectComparisonCalled == 3);
-    VERIFY(false == runscript("uoc2 != uoc1a"));
-    VERIFY(userObjectComparisonCalled == 4);
-
-    // Comparison against a non-object doesn't invoke uoc
-    userObjectComparisonCalled = 0; 
-    userObjectComparisonReturn = false;
-    VERIFY(false == runscript("uoc1a == string1a"));
-    VERIFY(userObjectComparisonCalled == 0);
-    VERIFY(false == runscript("string1a == uoc1a"));
-    VERIFY(userObjectComparisonCalled == 0);
-    VERIFY(false == runscript("2 == uoc1a"));
-    VERIFY(userObjectComparisonCalled == 0);
-    VERIFY(true == runscript("uoc1a != string1a"));
-    VERIFY(userObjectComparisonCalled == 0);
-    VERIFY(true == runscript("string1a != uoc1a"));
-    VERIFY(userObjectComparisonCalled == 0);
-    VERIFY(true == runscript("2 != uoc1a"));
-    VERIFY(userObjectComparisonCalled == 0);
-    
-    // Comparison against a non-uoc-object still invokes uoc
-    userObjectComparisonCalled = 0; 
-    userObjectComparisonReturn = false;
-    VERIFY(false == runscript("uoc1a == obj1a"));
-    VERIFY(userObjectComparisonCalled == 1);
-    VERIFY(false == runscript("obj1a == uoc1a"));
-    VERIFY(userObjectComparisonCalled == 2);
-    userObjectComparisonReturn = true;
-    VERIFY(true == runscript("uoc1a == obj1a"));
-    VERIFY(userObjectComparisonCalled == 3);
-    VERIFY(true == runscript("obj1a == uoc1a"));
-    VERIFY(userObjectComparisonCalled == 4);
-
-    // != comparison against a non-uoc-object still invokes uoc
-    userObjectComparisonCalled = 0; 
-    userObjectComparisonReturn = false;
-    VERIFY(true == runscript("uoc1a != obj1a"));
-    VERIFY(userObjectComparisonCalled == 1);
-    VERIFY(true == runscript("obj1a != uoc1a"));
-    VERIFY(userObjectComparisonCalled == 2);
-    userObjectComparisonReturn = true;
-    VERIFY(false == runscript("uoc1a != obj1a"));
-    VERIFY(userObjectComparisonCalled == 3);
-    VERIFY(false == runscript("obj1a != uoc1a"));
-    VERIFY(userObjectComparisonCalled == 4);
-
-    // Comparing two non-uoc objects does not invoke uoc
-    userObjectComparisonCalled = 0; 
-    userObjectComparisonReturn = false;
-    VERIFY(true == runscript("obj1a == obj1a"));
-    VERIFY(true == runscript("obj1a == obj1b"));
-    VERIFY(false == runscript("obj1a == obj2"));
-    VERIFY(false == runscript("obj1a == string1a"));
-    VERIFY(true == runscript("string1a == string1a"));
-    VERIFY(true == runscript("string1a == string1b"));
-    VERIFY(false == runscript("string1a == string2"));
-    VERIFY(userObjectComparisonCalled == 0);
-
-    // Correct lhs and rhs passed to uoc
-    userObjectComparisonCalled = 0; 
-    userObjectComparisonReturn = false;
-    SET_EXPECTED(uoc1, uoc2);
-    VERIFY(false == runscript("uoc1a == uoc2"));
-    VERIFY(true == expectedObjectsCompared);
-    SET_EXPECTED(uoc2, uoc1);
-    VERIFY(false == runscript("uoc2 == uoc1a"));
-    VERIFY(true == expectedObjectsCompared);
-    SET_EXPECTED(uoc1, uoc2);
-    VERIFY(true == runscript("uoc1a != uoc2"));
-    VERIFY(true == expectedObjectsCompared);
-    SET_EXPECTED(uoc2, uoc1);
-    VERIFY(true == runscript("uoc2 != uoc1a"));
-    VERIFY(true == expectedObjectsCompared);
-    SET_EXPECTED(uoc1, obj1);
-    VERIFY(false == runscript("uoc1a == obj1a"));
-    VERIFY(true == expectedObjectsCompared);
-    SET_EXPECTED(obj1, uoc1);
-    VERIFY(false == runscript("obj1a == uoc1a"));
-    VERIFY(true == expectedObjectsCompared);
-
-cleanup:
-    V8::SetUserObjectComparisonCallbackFunction(0);
-    context.Dispose();
-
-    ENDTEST();
-}
diff --git a/tests/auto/declarative/v8/v8test.h b/tests/auto/declarative/v8/v8test.h
deleted file mode 100644
index 31acefc8b3..0000000000
--- a/tests/auto/declarative/v8/v8test.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef V8TEST_H
-#define V8TEST_H
-
-#include "../../../../src/3rdparty/v8/include/v8.h"
-
-bool v8test_eval();
-bool v8test_userobjectcompare();
-
-#endif // V8TEST_H
-