1 files changed, 64 insertions, 1 deletions

diff --git a/tests/auto/translation/tst_translation.cpp b/tests/auto/translation/tst_translation.cpp
index 9cbca915..ffb39f96 100644
--- a/tests/auto/translation/tst_translation.cpp
+++ b/tests/auto/translation/tst_translation.cpp
@@ -42,8 +42,10 @@
 #include <QtGui/qpa/qplatformtheme.h>
 #include <QtQuick/qquickview.h>
 #include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickcombobox_p.h>
 #include <QtQuickTemplates2/private/qquickdialog_p.h>
 #include <QtQuickTemplates2/private/qquickdialogbuttonbox_p.h>
+#include <QtQuickTemplates2/private/qquicktextfield_p.h>
 
 using namespace QQuickVisualTestUtil;
 
@@ -53,6 +55,8 @@ class tst_translation : public QQmlDataTest
 
 private slots:
     void dialogButtonBox();
+    void dialogButtonBoxWithCustomButtons();
+    void comboBox();
 };
 
 void tst_translation::dialogButtonBox()
@@ -82,7 +86,7 @@ void tst_translation::dialogButtonBox()
     QCOMPARE(discardButton->text(), defaultDiscardText);
 
     QTranslator translator;
-    QVERIFY(translator.load(":/i18n/qtbase_fr.qm"));
+    QVERIFY(translator.load("qtbase_fr.qm", ":/"));
     QVERIFY(qApp->installTranslator(&translator));
     view.engine()->retranslate();
 
@@ -95,6 +99,65 @@ void tst_translation::dialogButtonBox()
     QCOMPARE(discardButton->text(), translatedDiscardText);
 }
 
+// Test that custom buttons with explicitly specified text
+// do not have that text overwritten on language changes.
+void tst_translation::dialogButtonBoxWithCustomButtons()
+{
+    // This is just a way of simulating the translator going out of scope
+    // after the QML has been loaded.
+    QScopedPointer<QTranslator> translator(new QTranslator);
+    // Doesn't matter which language it is, as we won't be using it anyway.
+    QVERIFY(translator->load("qtbase_fr.qm", ":/"));
+    QVERIFY(qApp->installTranslator(translator.data()));
+
+    QQuickView view(testFileUrl("dialogButtonBoxWithCustomButtons.qml"));
+    if (view.status() != QQuickView::Ready)
+        QFAIL("Failed to load QML file");
+    view.show();
+    QVERIFY(QTest::qWaitForWindowActive(&view));
+
+    QQuickDialog *dialog = view.rootObject()->property("dialog").value<QQuickDialog*>();
+    QVERIFY(dialog);
+
+    QQuickDialogButtonBox *dialogButtonBox = qobject_cast<QQuickDialogButtonBox*>(dialog->footer());
+    QVERIFY(dialogButtonBox);
+
+    auto okButton = dialogButtonBox->findChild<QQuickAbstractButton*>("okButton");
+    QVERIFY(okButton);
+    QCOMPARE(okButton->text(), QLatin1String("OK"));
+
+    QQuickAbstractButton *cancelButton = dialogButtonBox->findChild<QQuickAbstractButton*>("cancelButton");
+    QVERIFY(cancelButton);
+    QCOMPARE(cancelButton->text(), QLatin1String("Cancel"));
+
+    // Delete the translator and hence cause a LanguageChange event,
+    // but _without_ calling QQmlEngine::retranslate(), which would
+    // restore the original bindings and hence not reproduce the issue.
+    translator.reset();
+    QCOMPARE(okButton->text(), QLatin1String("OK"));
+    QCOMPARE(cancelButton->text(), QLatin1String("Cancel"));
+}
+
+void tst_translation::comboBox()
+{
+    QQuickView view(testFileUrl("comboBox.qml"));
+
+    QQuickComboBox *comboBox = qobject_cast<QQuickComboBox*>(view.rootObject());
+    QVERIFY(comboBox);
+    QCOMPARE(comboBox->displayText(), QLatin1String("Hello"));
+
+    QQuickTextField *contentItem = qobject_cast<QQuickTextField*>(comboBox->contentItem());
+    QVERIFY(contentItem);
+    QCOMPARE(contentItem->text(), QLatin1String("Hello"));
+
+    QTranslator translator;
+    QVERIFY(translator.load("qml_jp.qm", ":/"));
+    QVERIFY(qApp->installTranslator(&translator));
+    view.engine()->retranslate();
+    QTRY_COMPARE(comboBox->displayText(), QString::fromUtf8("こんにちは"));
+    QCOMPARE(contentItem->text(), QString::fromUtf8("こんにちは"));
+}
+
 QTEST_MAIN(tst_translation)
 
 #include "tst_translation.moc"