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>

9 files changed, 244 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmltranslation/data/idtranslation.qml b/tests/auto/qml/qqmltranslation/data/idtranslation.qml
new file mode 100644
index 0000000000..b128a1e578
--- /dev/null
+++ b/tests/auto/qml/qqmltranslation/data/idtranslation.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+
+QtObject {
+    property string _idTranslation2: QT_TRID_NOOP("qtn_hello_world")
+    property string idTranslation: qsTrId("qtn_hello_world")
+    property string idTranslation2: qsTrId(_idTranslation2)
+    property string idTranslation3: if (1) qsTrId("qtn_hello_world")
+}
diff --git a/tests/auto/qml/qqmltranslation/data/qml_fr.qm b/tests/auto/qml/qqmltranslation/data/qml_fr.qm
new file mode 100644
index 0000000000..252022515a
--- /dev/null
+++ b/tests/auto/qml/qqmltranslation/data/qml_fr.qm
diff --git a/tests/auto/qml/qqmltranslation/data/qml_fr.ts b/tests/auto/qml/qqmltranslation/data/qml_fr.ts
new file mode 100644
index 0000000000..b003e239bc
--- /dev/null
+++ b/tests/auto/qml/qqmltranslation/data/qml_fr.ts
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr" sourcelanguage="en">
+<context>
+    <name>CustomContext</name>
+    <message>
+        <location filename="translation.qml" line="5"/>
+        <location filename="translation.qml" line="11"/>
+        <source>goodbye</source>
+        <translation>au revoir</translation>
+    </message>
+    <message>
+        <location filename="translation.qml" line="8"/>
+        <source>see ya</source>
+        <comment>informal &apos;goodbye&apos;</comment>
+        <translation>à plus tard</translation>
+    </message>
+</context>
+<context>
+    <name>translation</name>
+    <message>
+        <location filename="translation.qml" line="4"/>
+        <location filename="translation.qml" line="10"/>
+        <source>hello</source>
+        <translation>bonjour</translation>
+    </message>
+    <message>
+        <location filename="translation.qml" line="7"/>
+        <source>hi</source>
+        <comment>informal &apos;hello&apos;</comment>
+        <translation>salut</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="translation.qml" line="15"/>
+        <location filename="translation.qml" line="16"/>
+        <source>%n duck(s)</source>
+        <translation>
+            <numerusform>%n canard</numerusform>
+            <numerusform>%n canards</numerusform>
+        </translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/qml/qqmltranslation/data/qmlid_fr.qm b/tests/auto/qml/qqmltranslation/data/qmlid_fr.qm
new file mode 100644
index 0000000000..265164916f
--- /dev/null
+++ b/tests/auto/qml/qqmltranslation/data/qmlid_fr.qm
diff --git a/tests/auto/qml/qqmltranslation/data/qmlid_fr.ts b/tests/auto/qml/qqmltranslation/data/qmlid_fr.ts
new file mode 100644
index 0000000000..bff39b80b6
--- /dev/null
+++ b/tests/auto/qml/qqmltranslation/data/qmlid_fr.ts
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr">
+<context>
+    <name></name>
+    <message id="qtn_hello_world">
+        <location filename="idtranslation.qml" line="4"/>
+        <location filename="idtranslation.qml" line="5"/>
+        <source></source>
+        <translation>bonjour tout le monde</translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/qml/qqmltranslation/data/translation.qml b/tests/auto/qml/qqmltranslation/data/translation.qml
new file mode 100644
index 0000000000..8435bedb28
--- /dev/null
+++ b/tests/auto/qml/qqmltranslation/data/translation.qml
@@ -0,0 +1,21 @@
+import QtQuick 2.0
+
+QtObject {
+    property string basic: qsTr("hello")
+    property string basic2: qsTranslate("CustomContext", "goodbye")
+    property string basic3: if (1) qsTr("hello")
+
+    property string disambiguation: qsTr("hi", "informal 'hello'")
+    property string disambiguation2: qsTranslate("CustomContext", "see ya", "informal 'goodbye'")
+    property string disambiguation3: if (1) qsTr("hi", "informal 'hello'")
+
+    property string _noop: QT_TR_NOOP("hello")
+    property string _noop2: QT_TRANSLATE_NOOP("CustomContext", "goodbye")
+    property string noop: qsTr(_noop)
+    property string noop2: qsTranslate("CustomContext", _noop2)
+
+    property string singular: qsTr("%n duck(s)", "", 1)
+    property string singular2: if (1) qsTr("%n duck(s)", "", 1)
+    property string plural: qsTr("%n duck(s)", "", 2)
+    property string plural2: if (1) qsTr("%n duck(s)", "", 2)
+}
diff --git a/tests/auto/qml/qqmltranslation/data/translation.qrc b/tests/auto/qml/qqmltranslation/data/translation.qrc
new file mode 100644
index 0000000000..2e2d0a0497
--- /dev/null
+++ b/tests/auto/qml/qqmltranslation/data/translation.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>translation.qml</file>
+        <file>qml_fr.qm</file>
+    </qresource>
+</RCC>
diff --git a/tests/auto/qml/qqmltranslation/qqmltranslation.pro b/tests/auto/qml/qqmltranslation/qqmltranslation.pro
new file mode 100644
index 0000000000..d3f98e181f
--- /dev/null
+++ b/tests/auto/qml/qqmltranslation/qqmltranslation.pro
@@ -0,0 +1,16 @@
+CONFIG += testcase
+TARGET = tst_qqmltranslation
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qqmltranslation.cpp
+RESOURCES += data/translation.qrc
+
+include (../../shared/util.pri)
+
+testDataFiles.files = data
+testDataFiles.path = .
+DEPLOYMENT += testDataFiles
+
+CONFIG += parallel_test
+
+QT += core-private gui-private qml-private testlib
diff --git a/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp b/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp
new file mode 100644
index 0000000000..077fa18f5f
--- /dev/null
+++ b/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** 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 <QQmlEngine>
+#include <QQmlComponent>
+#include <QTranslator>
+#include "../../shared/util.h"
+
+class tst_qqmltranslation : public QQmlDataTest
+{
+    Q_OBJECT
+public:
+    tst_qqmltranslation() {}
+
+private slots:
+    void translation();
+    void idTranslation();
+    void translationInQrc();
+};
+
+void tst_qqmltranslation::translation()
+{
+    QTranslator translator;
+    translator.load(QLatin1String("qml_fr"), dataDirectory());
+    QCoreApplication::installTranslator(&translator);
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("translation.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("basic").toString(), QLatin1String("bonjour"));
+    QCOMPARE(object->property("basic2").toString(), QLatin1String("au revoir"));
+    QCOMPARE(object->property("basic3").toString(), QLatin1String("bonjour"));
+    QCOMPARE(object->property("disambiguation").toString(), QLatin1String("salut"));
+    QCOMPARE(object->property("disambiguation2").toString(), QString::fromUtf8("\xc3\xa0 plus tard"));
+    QCOMPARE(object->property("disambiguation3").toString(), QLatin1String("salut"));
+    QCOMPARE(object->property("noop").toString(), QLatin1String("bonjour"));
+    QCOMPARE(object->property("noop2").toString(), QLatin1String("au revoir"));
+    QCOMPARE(object->property("singular").toString(), QLatin1String("1 canard"));
+    QCOMPARE(object->property("singular2").toString(), QLatin1String("1 canard"));
+    QCOMPARE(object->property("plural").toString(), QLatin1String("2 canards"));
+    QCOMPARE(object->property("plural2").toString(), QLatin1String("2 canards"));
+
+    QCoreApplication::removeTranslator(&translator);
+    delete object;
+}
+
+void tst_qqmltranslation::idTranslation()
+{
+    QTranslator translator;
+    translator.load(QLatin1String("qmlid_fr"), dataDirectory());
+    QCoreApplication::installTranslator(&translator);
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("idtranslation.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("idTranslation").toString(), QLatin1String("bonjour tout le monde"));
+    QCOMPARE(object->property("idTranslation2").toString(), QLatin1String("bonjour tout le monde"));
+    QCOMPARE(object->property("idTranslation3").toString(), QLatin1String("bonjour tout le monde"));
+
+    QCoreApplication::removeTranslator(&translator);
+    delete object;
+}
+
+void tst_qqmltranslation::translationInQrc()
+{
+    QTranslator translator;
+    translator.load(":/qml_fr.qm");
+    QCoreApplication::installTranslator(&translator);
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:/translation.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("basic").toString(), QLatin1String("bonjour"));
+    QCOMPARE(object->property("basic2").toString(), QLatin1String("au revoir"));
+    QCOMPARE(object->property("basic3").toString(), QLatin1String("bonjour"));
+    QCOMPARE(object->property("disambiguation").toString(), QLatin1String("salut"));
+    QCOMPARE(object->property("disambiguation2").toString(), QString::fromUtf8("\xc3\xa0 plus tard"));
+    QCOMPARE(object->property("disambiguation3").toString(), QLatin1String("salut"));
+    QCOMPARE(object->property("noop").toString(), QLatin1String("bonjour"));
+    QCOMPARE(object->property("noop2").toString(), QLatin1String("au revoir"));
+    QCOMPARE(object->property("singular").toString(), QLatin1String("1 canard"));
+    QCOMPARE(object->property("singular2").toString(), QLatin1String("1 canard"));
+    QCOMPARE(object->property("plural").toString(), QLatin1String("2 canards"));
+    QCOMPARE(object->property("plural2").toString(), QLatin1String("2 canards"));
+
+    QCoreApplication::removeTranslator(&translator);
+    delete object;
+}
+
+QTEST_MAIN(tst_qqmltranslation)
+
+#include "tst_qqmltranslation.moc"