From d4fe2fe849a54c3f9fce2e04d314fb70fa37509d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 17 Apr 2019 14:07:07 +0200 Subject: Make QtWebEngine imports consistent Somehow on some platforms we end up with the import version of the wrong module. Change-Id: I6427f3f5375f2059d371c9a0fc035f1ec4195a49 Fixes: QTBUG-74566 Reviewed-by: Friedemann Kleint --- examples/webengine/quicknanobrowser/BrowserDialog.qml | 2 +- examples/webengine/quicknanobrowser/DownloadView.qml | 2 +- examples/webengine/quicknanobrowser/main.cpp | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/webengine/quicknanobrowser/BrowserDialog.qml b/examples/webengine/quicknanobrowser/BrowserDialog.qml index 6b0b3acd6..a7ff9a55b 100644 --- a/examples/webengine/quicknanobrowser/BrowserDialog.qml +++ b/examples/webengine/quicknanobrowser/BrowserDialog.qml @@ -50,7 +50,7 @@ import QtQuick 2.1 import QtQuick.Window 2.2 -import QtWebEngine 1.7 +import QtWebEngine 1.9 Window { id: window diff --git a/examples/webengine/quicknanobrowser/DownloadView.qml b/examples/webengine/quicknanobrowser/DownloadView.qml index ed28c761c..f6ebeab4a 100644 --- a/examples/webengine/quicknanobrowser/DownloadView.qml +++ b/examples/webengine/quicknanobrowser/DownloadView.qml @@ -51,7 +51,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 -import QtWebEngine 1.2 +import QtWebEngine 1.9 import QtQuick.Layouts 1.0 Rectangle { diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp index 18ba7b3e2..8d032f5d8 100644 --- a/examples/webengine/quicknanobrowser/main.cpp +++ b/examples/webengine/quicknanobrowser/main.cpp @@ -89,7 +89,10 @@ int main(int argc, char **argv) Utils utils; appEngine.rootContext()->setContextProperty("utils", &utils); appEngine.load(QUrl("qrc:/ApplicationRoot.qml")); - QMetaObject::invokeMethod(appEngine.rootObjects().first(), "load", Q_ARG(QVariant, startupUrl())); + if (!appEngine.rootObjects().isEmpty()) + QMetaObject::invokeMethod(appEngine.rootObjects().first(), "load", Q_ARG(QVariant, startupUrl())); + else + qFatal("Failed to load sources"); return app.exec(); } -- cgit v1.2.3