7 files changed, 69 insertions, 43 deletions
diff --git a/src/plugins/platforms/qnx/qqnxglcontext.cpp b/src/plugins/platforms/qnx/qqnxglcontext.cpp
index 1d030ba1aa..69391c4fec 100644
--- a/src/plugins/platforms/qnx/qqnxglcontext.cpp
+++ b/src/plugins/platforms/qnx/qqnxglcontext.cpp
@@ -58,8 +58,6 @@
 
 QT_BEGIN_NAMESPACE
 
-EGLDisplay QQnxGLContext::ms_eglDisplay = EGL_NO_DISPLAY;
-
 static QEGLPlatformContext::Flags makeFlags()
 {
     QEGLPlatformContext::Flags result = 0;
@@ -71,7 +69,8 @@ static QEGLPlatformContext::Flags makeFlags()
 }
 
 QQnxGLContext::QQnxGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share)
-    : QEGLPlatformContext(format, share, ms_eglDisplay, 0, QVariant(), makeFlags())
+    : QEGLPlatformContext(format, share, QQnxIntegration::instance()->eglDisplay(), 0, QVariant(),
+                          makeFlags())
 {
 }
 
@@ -79,28 +78,6 @@ QQnxGLContext::~QQnxGLContext()
 {
 }
 
-void QQnxGLContext::initializeContext()
-{
-    qGLContextDebug();
-
-    // Initialize connection to EGL
-    ms_eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    if (Q_UNLIKELY(ms_eglDisplay == EGL_NO_DISPLAY))
-        qFatal("QQnxGLContext: failed to obtain EGL display: %x", eglGetError());
-
-    EGLBoolean eglResult = eglInitialize(ms_eglDisplay, 0, 0);
-    if (Q_UNLIKELY(eglResult != EGL_TRUE))
-        qFatal("QQnxGLContext: failed to initialize EGL display, err=%d", eglGetError());
-}
-
-void QQnxGLContext::shutdownContext()
-{
-    qGLContextDebug();
-
-    // Close connection to EGL
-    eglTerminate(ms_eglDisplay);
-}
-
 EGLSurface QQnxGLContext::eglSurfaceForPlatformSurface(QPlatformSurface *surface)
 {
     QQnxEglWindow *window = static_cast<QQnxEglWindow *>(surface);
diff --git a/src/plugins/platforms/qnx/qqnxglcontext.h b/src/plugins/platforms/qnx/qqnxglcontext.h
index 19179a80e2..5d807ee9e4 100644
--- a/src/plugins/platforms/qnx/qqnxglcontext.h
+++ b/src/plugins/platforms/qnx/qqnxglcontext.h
@@ -58,19 +58,12 @@ public:
     QQnxGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share);
     virtual ~QQnxGLContext();
 
-    static void initializeContext();
-    static void shutdownContext();
-
     bool makeCurrent(QPlatformSurface *surface) override;
     void swapBuffers(QPlatformSurface *surface) override;
     void doneCurrent() override;
 
 protected:
     EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) override;
-
-private:
-    //Can be static because different displays returne the same handle
-    static EGLDisplay ms_eglDisplay;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp
index f479e94988..84baa6ec44 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.cpp
+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
@@ -170,6 +170,9 @@ QQnxIntegration::QQnxIntegration(const QStringList &paramList)
 #if QT_CONFIG(draganddrop)
     , m_drag(new QSimpleDrag())
 #endif
+#if QT_CONFIG(opengl)
+    , m_eglDisplay(EGL_NO_DISPLAY)
+#endif
 {
     ms_instance = this;
     m_options = parseOptions(paramList);
@@ -195,9 +198,8 @@ QQnxIntegration::QQnxIntegration(const QStringList &paramList)
     QMetaObject::invokeMethod(m_navigatorEventNotifier, "start", Qt::QueuedConnection);
 #endif
 
-#if !defined(QT_NO_OPENGL)
-    // Initialize global OpenGL resources
-    QQnxGLContext::initializeContext();
+#if QT_CONFIG(opengl)
+    createEglDisplay();
 #endif
 
     // Create/start event thread
@@ -284,9 +286,8 @@ QQnxIntegration::~QQnxIntegration()
     // Close connection to QNX composition manager
     screen_destroy_context(m_screenContext);
 
-#if !defined(QT_NO_OPENGL)
-    // Cleanup global OpenGL resources
-    QQnxGLContext::shutdownContext();
+#if QT_CONFIG(opengl)
+    destroyEglDisplay();
 #endif
 
 #if QT_CONFIG(qqnx_pps)
@@ -741,4 +742,28 @@ bool QQnxIntegration::supportsNavigatorEvents() const
     return m_navigator != 0;
 }
 
+#if QT_CONFIG(opengl)
+void QQnxIntegration::createEglDisplay()
+{
+    qIntegrationDebug();
+
+    // Initialize connection to EGL
+    m_eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    if (Q_UNLIKELY(m_eglDisplay == EGL_NO_DISPLAY))
+        qFatal("QQnxiIntegration: failed to obtain EGL display: %x", eglGetError());
+
+    EGLBoolean eglResult = eglInitialize(m_eglDisplay, 0, 0);
+    if (Q_UNLIKELY(eglResult != EGL_TRUE))
+        qFatal("QQnxIntegration: failed to initialize EGL display, err=%d", eglGetError());
+}
+
+void QQnxIntegration::destroyEglDisplay()
+{
+    qIntegrationDebug();
+
+    // Close connection to EGL
+    eglTerminate(m_eglDisplay);
+}
+#endif
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h
index 0bf37880d1..2596af3c45 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.h
+++ b/src/plugins/platforms/qnx/qqnxintegration.h
@@ -46,6 +46,10 @@
 
 #include <screen/screen.h>
 
+#if QT_CONFIG(opengl)
+#include <EGL/egl.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QQnxScreenEventThread;
@@ -96,7 +100,8 @@ public:
     QPlatformWindow *createPlatformWindow(QWindow *window) const override;
     QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
 
-#if !defined(QT_NO_OPENGL)
+#if QT_CONFIG(opengl)
+    EGLDisplay eglDisplay() const { return m_eglDisplay; }
     QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override;
 #endif
 
@@ -175,6 +180,12 @@ private:
 
     Options m_options;
 
+#if QT_CONFIG(opengl)
+    EGLDisplay m_eglDisplay;
+    void createEglDisplay();
+    void destroyEglDisplay();
+#endif
+
     static QQnxIntegration *ms_instance;
 
     friend class QQnxWindow;
diff --git a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
index a9b5860187..e3a6aea99f 100644
--- a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
@@ -257,7 +257,7 @@ void QQnxScreenEventHandler::injectKeyboardEvent(int flags, int sym, int modifie
                                                capKeyString(cap, modifiers, key);
 
     QWindowSystemInterface::handleExtendedKeyEvent(QGuiApplication::focusWindow(), type, key, qtMod,
-            scan, virtualKey, modifiers, keyStr);
+            scan, virtualKey, modifiers, keyStr, flags & KEY_REPEAT);
     qScreenEventDebug() << "Qt key t=" << type << ", k=" << key << ", s=" << keyStr;
 }
 
diff --git a/src/plugins/platforms/qnx/qqnxscreeneventthread.cpp b/src/plugins/platforms/qnx/qqnxscreeneventthread.cpp
index 1b5f3b4954..491c314488 100644
--- a/src/plugins/platforms/qnx/qqnxscreeneventthread.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreeneventthread.cpp
@@ -60,6 +60,18 @@ static const int c_screenCode = _PULSE_CODE_MINAVAIL + 0;
 static const int c_armCode = _PULSE_CODE_MINAVAIL + 1;
 static const int c_quitCode = _PULSE_CODE_MINAVAIL + 2;
 
+#if !defined(screen_register_event)
+int screen_register_event(screen_context_t, struct sigevent *event)
+{
+    return MsgRegisterEvent(event, -1);
+}
+
+int screen_unregister_event(struct sigevent *event)
+{
+    return MsgUnregisterEvent(event);
+}
+#endif
+
 QQnxScreenEventThread::QQnxScreenEventThread(screen_context_t context)
     : QThread()
     , m_screenContext(context)
@@ -75,10 +87,14 @@ QQnxScreenEventThread::QQnxScreenEventThread(screen_context_t context)
         qFatal("QQnxScreenEventThread: Can't continue without a channel connection");
     }
 
-    struct sigevent screenEvent;
-    SIGEV_PULSE_INIT(&screenEvent, m_connectionId, SIGEV_PULSE_PRIO_INHERIT, c_screenCode, 0);
+    SIGEV_PULSE_INIT(&m_screenEvent, m_connectionId, SIGEV_PULSE_PRIO_INHERIT, c_screenCode, 0);
+    if (screen_register_event(m_screenContext, &m_screenEvent) == -1) {
+        ConnectDetach(m_connectionId);
+        ChannelDestroy(m_channelId);
+        qFatal("QQnxScreenEventThread: Can't continue without a registered event");
+    }
 
-    screen_notify(m_screenContext, SCREEN_NOTIFY_EVENT, nullptr, &screenEvent);
+    screen_notify(m_screenContext, SCREEN_NOTIFY_EVENT, nullptr, &m_screenEvent);
 }
 
 QQnxScreenEventThread::~QQnxScreenEventThread()
@@ -86,6 +102,8 @@ QQnxScreenEventThread::~QQnxScreenEventThread()
     // block until thread terminates
     shutdown();
 
+    screen_notify(m_screenContext, SCREEN_NOTIFY_EVENT, nullptr, nullptr);
+    screen_unregister_event(&m_screenEvent);
     ConnectDetach(m_connectionId);
     ChannelDestroy(m_channelId);
 }
diff --git a/src/plugins/platforms/qnx/qqnxscreeneventthread.h b/src/plugins/platforms/qnx/qqnxscreeneventthread.h
index 3c8d197545..e5b762369c 100644
--- a/src/plugins/platforms/qnx/qqnxscreeneventthread.h
+++ b/src/plugins/platforms/qnx/qqnxscreeneventthread.h
@@ -45,6 +45,7 @@
 #include <QtCore/QMutex>
 
 #include <screen/screen.h>
+#include <sys/siginfo.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -73,6 +74,7 @@ private:
 
     int m_channelId;
     int m_connectionId;
+    struct sigevent m_screenEvent;
     screen_context_t m_screenContext;
     bool m_emitNeededOnNextScreenPulse = true;
     int m_screenPulsesSinceLastArmPulse = 0;