diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-09-11 14:33:20 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-09-22 16:53:30 +0300 |
| commit | 028886b79d0f52818f7ae4cea0e1487f0338f41f (patch) | |
| tree | 4b307984fa350677be31fa159c44420b98f3216f | |
| parent | 406db8fabcf8de5ab31880ca579edb7004cc4f4e (diff) | |
webengine: update demo for QtWebEngine in Qt 5.4
Change-Id: Ic731441399f78e2044555bfc4860b499c425bee2
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | basicsuite/shared/main.cpp | 5 | ||||
| -rw-r--r-- | basicsuite/webengine/main.qml | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index d5b203f..00284b3 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -50,9 +50,8 @@ int main(int argc, char **argv) #if defined(USE_QTWEBENGINE) // This is currently needed by all QtWebEngine applications using the HW accelerated QQuickWebView. // It enables sharing the QOpenGLContext of all QQuickWindows of the application. - // We have to do so until we expose a public API for it in Qt or choose to enable it - // by default earliest in Qt 5.4.0. - QWebEngine::initialize(); + // We have to do so until we expose public API for it in Qt or choose to enable it by default. + QtWebEngine::initialize(); #endif QString path = app.applicationDirPath(); diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml index d2f5184..2e1f259 100644 --- a/basicsuite/webengine/main.qml +++ b/basicsuite/webengine/main.qml @@ -43,7 +43,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Layouts 1.1 -import QtWebEngine 0.9 +import QtWebEngine 1.0 import "ui" |