Merge remote-tracking branch 'origin/stable' into dev

* origin/stable: (63 commits)
  Doc: Bump version to 3.1.1
  Make FPS checkbox persistent
  Handle accelerometer readings in rotated items
  webengine: Add slight delay before loading the start page
  webengine: disable the webgl demo
  Update screenshot of the Virtual Keyboard demo
  [Doc] Use symbolic links for demo preview images
  Changed the audio track on the Qt_EnterpriseEmbedded_1080p.mp4 video.
  Fix demo descriptions.
  launchersettings: make ip field span two columns
  Remove deleted demos also from doc
  Update all VirtualKeyboard import to version 1.1
  Doc: Bump version to 3.1.0
  Doc: Content/language improvement for About QtEE demo.
  Disable GraphicalEffects demo on beagleboneblack
  about: fit text properly to the box
  Fix Meet Qt Enterprise Embedded video url on startup
  Fix a typo in the new About presentation
  About Boot to Qt-demo update
  Update Enterprise gallery demo description
  ...

Change-Id: I928ab65867993c83ae645834430fd15825349fde

1 files changed, 14 insertions, 1 deletions

diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp
index d33b09c..d5b203f 100644
--- a/basicsuite/shared/main.cpp
+++ b/basicsuite/shared/main.cpp
@@ -34,14 +34,27 @@
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
 
-#include "engine.h"
+#if defined(USE_QTWEBENGINE)
+#include <qtwebengineglobal.h>
+#endif
 
+#include "engine.h"
 
 int main(int argc, char **argv)
 {
     //qputenv("QT_IM_MODULE", QByteArray("qtvkb"));
 
     QApplication app(argc, 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();
+#endif
+
     QString path = app.applicationDirPath();
 
     QPalette pal;