Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index f2f5b31f9..f6968acf5 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -60,6 +60,7 @@ private Q_SLOTS:
     void inputMethod();
     void inputMethodHints();
     void basicRenderingSanity();
+    void setZoomFactor();
     void printToPdf();
 
 private:
@@ -462,6 +463,25 @@ void tst_QQuickWebEngineView::inputMethodHints()
 #endif
 }
 
+void tst_QQuickWebEngineView::setZoomFactor()
+{
+    QQuickWebEngineView *view = webEngineView();
+
+    QVERIFY(qFuzzyCompare(view->zoomFactor(), 1.0));
+    view->setZoomFactor(2.5);
+    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+
+    view->setUrl(urlFromTestPath("html/basic_page.html"));
+    QVERIFY(waitForLoadSucceeded(view));
+    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+
+    view->setZoomFactor(0.1);
+    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+
+    view->setZoomFactor(5.5);
+    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+}
+
 void tst_QQuickWebEngineView::printToPdf()
 {
     QTemporaryDir tempDir(QDir::tempPath() + "/tst_qwebengineview-XXXXXX");