Commit d4fe2fe8 authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen
Browse files

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: default avatarFriedemann Kleint <Friedemann.Kleint@qt.io>
Showing with 6 additions and 3 deletions
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import QtWebEngine 1.7 import QtWebEngine 1.9
Window { Window {
id: window id: window
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0 import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Styles 1.0
import QtWebEngine 1.2 import QtWebEngine 1.9
import QtQuick.Layouts 1.0 import QtQuick.Layouts 1.0
Rectangle { Rectangle {
......
...@@ -89,7 +89,10 @@ int main(int argc, char **argv) ...@@ -89,7 +89,10 @@ int main(int argc, char **argv)
Utils utils; Utils utils;
appEngine.rootContext()->setContextProperty("utils", &utils); appEngine.rootContext()->setContextProperty("utils", &utils);
appEngine.load(QUrl("qrc:/ApplicationRoot.qml")); 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(); return app.exec();
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment