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>

2 files changed, 124 insertions, 0 deletions

diff --git a/tests/auto/qml/qmlplugindump/qmlplugindump.pro b/tests/auto/qml/qmlplugindump/qmlplugindump.pro
new file mode 100644
index 0000000000..498a520873
--- /dev/null
+++ b/tests/auto/qml/qmlplugindump/qmlplugindump.pro
@@ -0,0 +1,7 @@
+CONFIG += testcase
+TARGET = tst_qmlplugindump
+QT += testlib
+macx:CONFIG -= app_bundle
+CONFIG += parallel_test
+
+SOURCES += tst_qmlplugindump.cpp
diff --git a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
new file mode 100644
index 0000000000..5512cfdfe8
--- /dev/null
+++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** 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 <QLibraryInfo>
+#include <QDir>
+#include <QProcess>
+#include <QDebug>
+#include <cstdlib>
+
+class tst_qmlplugindump : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlplugindump();
+
+private slots:
+    void initTestCase();
+    void builtins();
+
+private:
+    QString qmlplugindumpPath;
+};
+
+tst_qmlplugindump::tst_qmlplugindump()
+{
+}
+
+void tst_qmlplugindump::initTestCase()
+{
+    qmlplugindumpPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
+
+#if defined(Q_OS_MAC)
+    qmlplugindumpPath += QLatin1String("/qmlplugindump.app/Contents/MacOS/qmlplugindump");
+#elif defined(Q_OS_WIN)
+    qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
+#else
+    qmlplugindumpPath += QLatin1String("/qmlplugindump");
+#endif
+
+    if (!QFileInfo(qmlplugindumpPath).exists()) {
+        QString message = QString::fromLatin1("qmlplugindump executable not found (looked for %0)")
+                .arg(qmlplugindumpPath);
+        QFAIL(qPrintable(message));
+    }
+}
+
+void tst_qmlplugindump::builtins()
+{
+    QProcess dumper;
+    QStringList args;
+    args += QLatin1String("-builtins");
+    dumper.start(qmlplugindumpPath, args);
+    dumper.waitForFinished();
+
+    if (dumper.error() != QProcess::UnknownError
+            || dumper.exitStatus() != QProcess::NormalExit) {
+        qWarning() << QString("Error while running '%1 %2'").arg(
+                          qmlplugindumpPath, args.join(QLatin1String(" ")));
+    }
+
+    if (dumper.error() == QProcess::FailedToStart) {
+        QFAIL("failed to start");
+    }
+    if (dumper.error() == QProcess::Crashed) {
+        qWarning() << "stderr:\n" << dumper.readAllStandardError();
+        QFAIL("crashed");
+    }
+
+    QCOMPARE(dumper.error(), QProcess::UnknownError);
+    QCOMPARE(dumper.exitStatus(), QProcess::NormalExit);
+
+    const QString &result = dumper.readAllStandardOutput();
+    QVERIFY(result.contains(QLatin1String("Module {")));
+}
+
+QTEST_MAIN(tst_qmlplugindump)
+
+#include "tst_qmlplugindump.moc"