From b14a08fd363defbff255b31b8d5482959dc53b4d Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 29 Jun 2009 14:00:38 +0200
Subject: Enable the new QWebHistory autotest, coming from src/3rdparty/webkit

Reviewed-by: Trust me
---
 tests/auto/auto.pro                    |  3 ++-
 tests/auto/qwebhistory/.gitignore      |  1 +
 tests/auto/qwebhistory/dummy.cpp       | 44 ++++++++++++++++++++++++++++++++++
 tests/auto/qwebhistory/qwebhistory.pro | 14 +++++++++++
 4 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/qwebhistory/.gitignore
 create mode 100644 tests/auto/qwebhistory/dummy.cpp
 create mode 100644 tests/auto/qwebhistory/qwebhistory.pro

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 9b62116..fb13abe 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -449,6 +449,7 @@ contains(QT_CONFIG, webkit): SUBDIRS += \
            qwebframe \
            qwebpage \
            qwebhistoryinterface \
-           qwebelement
+           qwebelement \
+           qwebhistory
 
 SUBDIRS += math3d
diff --git a/tests/auto/qwebhistory/.gitignore b/tests/auto/qwebhistory/.gitignore
new file mode 100644
index 0000000..2bdefcd
--- /dev/null
+++ b/tests/auto/qwebhistory/.gitignore
@@ -0,0 +1 @@
+tst_qwebhistory
diff --git a/tests/auto/qwebhistory/dummy.cpp b/tests/auto/qwebhistory/dummy.cpp
new file mode 100644
index 0000000..0c034f3
--- /dev/null
+++ b/tests/auto/qwebhistory/dummy.cpp
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtTest/QtTest>
+
+QTEST_NOOP_MAIN
+
diff --git a/tests/auto/qwebhistory/qwebhistory.pro b/tests/auto/qwebhistory/qwebhistory.pro
new file mode 100644
index 0000000..232f478
--- /dev/null
+++ b/tests/auto/qwebhistory/qwebhistory.pro
@@ -0,0 +1,14 @@
+load(qttest_p4)
+contains(QT_CONFIG,webkit) {
+    DEFINES += QTEST_WEBKIT
+    QT += webkit network
+    isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
+    isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
+
+    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebhistory
+    VPATH += $$TESTDIR
+    include($$TESTDIR/qwebhistory.pro)
+} else {
+    SOURCES += dummy.cpp
+}
+
-- 
cgit v0.12