diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-08-21 14:45:44 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-23 16:28:15 +0000 |
| commit | 32aaabf6075cd46249de0e3d4c8f038a9ac46fbc (patch) | |
| tree | 8aab71d6992520a21f25b191f5b72709e668fffd /tests | |
| parent | 42a1f19e3d06b8b23ab13c7479b754a05bee2b5e (diff) | |
tests: Fix build against Qt 5.9
Change-Id: I9a6b4e7625700c1ff2621f4e2a2125727c34d3a1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/dialogs/tst_dialogs.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/origins/tst_origins.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/quick/dialogs/tst_dialogs.cpp b/tests/auto/quick/dialogs/tst_dialogs.cpp index e1032f16c..ecc2764fd 100644 --- a/tests/auto/quick/dialogs/tst_dialogs.cpp +++ b/tests/auto/quick/dialogs/tst_dialogs.cpp @@ -175,7 +175,7 @@ void tst_Dialogs::authenticationDialogRequested() QCOMPARE(dialog->type(), type); QCOMPARE(dialog->realm(),realm); QCOMPARE(dialog->url(), url); - QCOMPARE(dialog->proxyHost(), "localhost"); + QCOMPARE(dialog->proxyHost(), QStringLiteral("localhost")); } void tst_Dialogs::javaScriptDialogRequested_data() diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp index 364c83c3e..31d16adff 100644 --- a/tests/auto/widgets/origins/tst_origins.cpp +++ b/tests/auto/widgets/origins/tst_origins.cpp @@ -664,22 +664,22 @@ void tst_Origins::viewSource() { QVERIFY(load(QSL("view-source:file:" THIS_DIR "resources/viewSource.html"))); #ifdef Q_OS_WIN - QCOMPARE(m_page->requestedUrl(), QSL("file:///" THIS_DIR "resources/viewSource.html")); + QCOMPARE(m_page->requestedUrl().toString(), QSL("file:///" THIS_DIR "resources/viewSource.html")); #else - QCOMPARE(m_page->requestedUrl(), QSL("file:" THIS_DIR "resources/viewSource.html")); + QCOMPARE(m_page->requestedUrl().toString(), QSL("file://" THIS_DIR "resources/viewSource.html")); #endif QVERIFY(load(QSL("view-source:qrc:/resources/viewSource.html"))); - QCOMPARE(m_page->requestedUrl(), QSL("qrc:/resources/viewSource.html")); + QCOMPARE(m_page->requestedUrl().toString(), QSL("qrc:/resources/viewSource.html")); QVERIFY(load(QSL("view-source:tst:/resources/viewSource.html"))); - QCOMPARE(m_page->requestedUrl(), QSL("about:blank")); + QCOMPARE(m_page->requestedUrl().toString(), QSL("about:blank")); QVERIFY(load(QSL("view-source:PathSyntax:/resources/viewSource.html"))); - QCOMPARE(m_page->requestedUrl(), QSL("about:blank")); + QCOMPARE(m_page->requestedUrl().toString(), QSL("about:blank")); QVERIFY(load(QSL("view-source:PathSyntax-ViewSourceAllowed:/resources/viewSource.html"))); - QCOMPARE(m_page->requestedUrl(), QSL("pathsyntax-viewsourceallowed:/resources/viewSource.html")); + QCOMPARE(m_page->requestedUrl().toString(), QSL("pathsyntax-viewsourceallowed:/resources/viewSource.html")); } QTEST_MAIN(tst_Origins) |