Rename QDeclarative symbols to QQuick and QQml

Symbols beginning with QDeclarative are already exported
by the quick1 module.

Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.

Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>

5 files changed, 176 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickspringanimation/data/springanimation1.qml b/tests/auto/quick/qquickspringanimation/data/springanimation1.qml
new file mode 100644
index 0000000000..9f52aa56c1
--- /dev/null
+++ b/tests/auto/quick/qquickspringanimation/data/springanimation1.qml
@@ -0,0 +1,4 @@
+import QtQuick 2.0
+
+SpringAnimation {
+}
diff --git a/tests/auto/quick/qquickspringanimation/data/springanimation2.qml b/tests/auto/quick/qquickspringanimation/data/springanimation2.qml
new file mode 100644
index 0000000000..9f72e51533
--- /dev/null
+++ b/tests/auto/quick/qquickspringanimation/data/springanimation2.qml
@@ -0,0 +1,16 @@
+import QtQuick 2.0
+
+Item {
+    Item {
+        id: item
+    }
+
+    SpringAnimation {
+        target: item; property: "x"
+        to: 1.44; velocity: 0.9
+        spring: 1.0; damping: 0.5
+        epsilon: 0.25; modulus: 360.0
+        mass: 2.0;
+        running: true;
+    }
+}
diff --git a/tests/auto/quick/qquickspringanimation/data/springanimation3.qml b/tests/auto/quick/qquickspringanimation/data/springanimation3.qml
new file mode 100644
index 0000000000..f4dc121eb8
--- /dev/null
+++ b/tests/auto/quick/qquickspringanimation/data/springanimation3.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+
+SpringAnimation {
+    to: 1.44; velocity: 0.9
+    spring: 1.0; damping: 0.5
+    epsilon: 0.25; modulus: 360.0
+    mass: 2.0; running: false
+}
diff --git a/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro b/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro
new file mode 100644
index 0000000000..8ad472f8cc
--- /dev/null
+++ b/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro
@@ -0,0 +1,15 @@
+CONFIG += testcase
+TARGET = tst_qquickspringanimation
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qquickspringanimation.cpp
+
+include (../../shared/util.pri)
+
+testDataFiles.files = data
+testDataFiles.path = .
+DEPLOYMENT += testDataFiles
+
+CONFIG += parallel_test
+
+QT += core-private gui-private v8-private qml-private quick-private testlib
diff --git a/tests/auto/quick/qquickspringanimation/tst_qquickspringanimation.cpp b/tests/auto/quick/qquickspringanimation/tst_qquickspringanimation.cpp
new file mode 100644
index 0000000000..4fa512d9b6
--- /dev/null
+++ b/tests/auto/quick/qquickspringanimation/tst_qquickspringanimation.cpp
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcomponent.h>
+#include <private/qquickspringanimation_p.h>
+#include <private/qqmlvaluetype_p.h>
+#include "../../shared/util.h"
+
+class tst_qquickspringanimation : public QQmlDataTest
+{
+    Q_OBJECT
+public:
+    tst_qquickspringanimation();
+
+private slots:
+    void defaultValues();
+    void values();
+    void disabled();
+
+private:
+    QQmlEngine engine;
+};
+
+tst_qquickspringanimation::tst_qquickspringanimation()
+{
+}
+
+void tst_qquickspringanimation::defaultValues()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("springanimation1.qml"));
+    QQuickSpringAnimation *obj = qobject_cast<QQuickSpringAnimation*>(c.create());
+
+    QVERIFY(obj != 0);
+
+    QCOMPARE(obj->to(), 0.);
+    QCOMPARE(obj->velocity(), 0.);
+    QCOMPARE(obj->spring(), 0.);
+    QCOMPARE(obj->damping(), 0.);
+    QCOMPARE(obj->epsilon(), 0.01);
+    QCOMPARE(obj->modulus(), 0.);
+    QCOMPARE(obj->mass(), 1.);
+    QCOMPARE(obj->isRunning(), false);
+
+    delete obj;
+}
+
+void tst_qquickspringanimation::values()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("springanimation2.qml"));
+    QObject *root = c.create();
+
+    QQuickSpringAnimation *obj = root->findChild<QQuickSpringAnimation*>();
+
+    QVERIFY(obj != 0);
+
+    QCOMPARE(obj->to(), 1.44);
+    QCOMPARE(obj->velocity(), 0.9);
+    QCOMPARE(obj->spring(), 1.0);
+    QCOMPARE(obj->damping(), 0.5);
+    QCOMPARE(obj->epsilon(), 0.25);
+    QCOMPARE(obj->modulus(), 360.0);
+    QCOMPARE(obj->mass(), 2.0);
+    QCOMPARE(obj->isRunning(), true);
+
+    QTRY_COMPARE(obj->isRunning(), false);
+
+    delete obj;
+}
+
+void tst_qquickspringanimation::disabled()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("springanimation3.qml"));
+    QQuickSpringAnimation *obj = qobject_cast<QQuickSpringAnimation*>(c.create());
+
+    QVERIFY(obj != 0);
+
+    QCOMPARE(obj->to(), 1.44);
+    QCOMPARE(obj->velocity(), 0.9);
+    QCOMPARE(obj->spring(), 1.0);
+    QCOMPARE(obj->damping(), 0.5);
+    QCOMPARE(obj->epsilon(), 0.25);
+    QCOMPARE(obj->modulus(), 360.0);
+    QCOMPARE(obj->mass(), 2.0);
+    QCOMPARE(obj->isRunning(), false);
+
+    delete obj;
+}
+
+QTEST_MAIN(tst_qquickspringanimation)
+
+#include "tst_qquickspringanimation.moc"