1 files changed, 13 insertions, 9 deletions
diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h
index f844a7508c..2993607489 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.h
+++ b/src/plugins/platforms/qnx/qqnxintegration.h
@@ -88,6 +88,8 @@ public:
     explicit QQnxIntegration(const QStringList &paramList);
     ~QQnxIntegration();
 
+    static QQnxIntegration *instance() { return ms_instance; }
+
     bool hasCapability(QPlatformIntegration::Capability cap) const override;
 
     QPlatformWindow *createPlatformWindow(QWindow *window) const override;
@@ -121,15 +123,15 @@ public:
 
     QPlatformServices *services() const override;
 
-    static QWindow *window(screen_window_t qnxWindow);
+    QWindow *window(screen_window_t qnxWindow);
 
     QQnxScreen *screenForNative(screen_display_t qnxScreen) const;
 
     void createDisplay(screen_display_t display, bool isPrimary);
     void removeDisplay(QQnxScreen *screen);
     QQnxScreen *primaryDisplay() const;
-    static Options options();
-    static screen_context_t screenContext();
+    Options options() const;
+    screen_context_t screenContext();
 
     QQnxNavigatorEventHandler *navigatorEventHandler();
 
@@ -137,10 +139,10 @@ private:
     void createDisplays();
     void destroyDisplays();
 
-    static void addWindow(screen_window_t qnxWindow, QWindow *window);
-    static void removeWindow(screen_window_t qnxWindow);
+    void addWindow(screen_window_t qnxWindow, QWindow *window);
+    void removeWindow(screen_window_t qnxWindow);
 
-    static screen_context_t ms_screenContext;
+    screen_context_t m_screenContext;
     QQnxScreenEventThread *m_screenEventThread;
     QQnxNavigatorEventHandler *m_navigatorEventHandler;
     QQnxAbstractVirtualKeyboard *m_virtualKeyboard;
@@ -162,10 +164,12 @@ private:
 #if QT_CONFIG(draganddrop)
     QSimpleDrag *m_drag;
 #endif
-    static QQnxWindowMapper ms_windowMapper;
-    static QMutex ms_windowMapperMutex;
+    QQnxWindowMapper m_windowMapper;
+    QMutex m_windowMapperMutex;
+
+    Options m_options;
 
-    static Options ms_options;
+    static QQnxIntegration *ms_instance;
 
     friend class QQnxWindow;
 };