From 0f532b29bb2106a81ad590f6007dffbc8a1186ff Mon Sep 17 00:00:00 2001
From: Andreas Holzammer <andreas.holzammer@kdab.com>
Date: Thu, 14 Mar 2013 09:10:37 +0100
Subject: [PATCH] [QNX]Add an option to not run fullscreen

Add commandline option to set the default for
fullscreen option.

Change-Id: Ieaf2be3858082fb0e572c8fbaabfd38a698f14f6
Reviewed-by: Frank Osterfeld <frank.osterfeld@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
---
 src/plugins/platforms/qnx/main.cpp            |  3 +--
 src/plugins/platforms/qnx/qqnxintegration.cpp | 21 +++++++++++++++++--
 src/plugins/platforms/qnx/qqnxintegration.h   | 11 +++++++++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/plugins/platforms/qnx/main.cpp b/src/plugins/platforms/qnx/main.cpp
index ea50b12cb3..fb81928625 100644
--- a/src/plugins/platforms/qnx/main.cpp
+++ b/src/plugins/platforms/qnx/main.cpp
@@ -46,9 +46,8 @@ QT_BEGIN_NAMESPACE
 
 QPlatformIntegration *QQnxIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
-    Q_UNUSED(paramList);
     if (system.toLower() == QLatin1String("qnx"))
-        return new QQnxIntegration;
+        return new QQnxIntegration(paramList);
 
     return 0;
 }
diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp
index 5ea4fef698..412c791eab 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.cpp
+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
@@ -84,6 +84,8 @@
 #include <qpa/qplatformwindow.h>
 #include <qpa/qwindowsysteminterface.h>
 
+#include <QtGui/private/qguiapplication_p.h>
+
 #if !defined(QT_NO_OPENGL)
 #include "qqnxglcontext.h"
 #include <QtGui/QOpenGLContext>
@@ -107,7 +109,16 @@ QT_BEGIN_NAMESPACE
 QQnxWindowMapper QQnxIntegration::ms_windowMapper;
 QMutex QQnxIntegration::ms_windowMapperMutex;
 
-QQnxIntegration::QQnxIntegration()
+static inline QQnxIntegration::Options parseOptions(const QStringList &paramList)
+{
+    QQnxIntegration::Options options = QQnxIntegration::NoOptions;
+    if (!paramList.contains(QLatin1String("no-fullscreen"))) {
+        options |= QQnxIntegration::FullScreenApplication;
+    }
+    return options;
+}
+
+QQnxIntegration::QQnxIntegration(const QStringList &paramList)
     : QPlatformIntegration()
     , m_screenEventThread(0)
     , m_navigatorEventHandler(new QQnxNavigatorEventHandler())
@@ -134,6 +145,7 @@ QQnxIntegration::QQnxIntegration()
 #if !defined(QT_NO_DRAGANDDROP)
     , m_drag(new QSimpleDrag())
 #endif
+    , m_options(parseOptions(paramList))
 {
     qIntegrationDebug() << Q_FUNC_INFO;
     // Open connection to QNX composition manager
@@ -385,7 +397,7 @@ QPlatformDrag *QQnxIntegration::drag() const
 QVariant QQnxIntegration::styleHint(QPlatformIntegration::StyleHint hint) const
 {
     qIntegrationDebug() << Q_FUNC_INFO;
-    if (hint == ShowIsFullScreen)
+    if ((hint == ShowIsFullScreen) && (m_options & FullScreenApplication))
         return true;
 
     return QPlatformIntegration::styleHint(hint);
@@ -529,6 +541,11 @@ QQnxScreen *QQnxIntegration::primaryDisplay() const
     return m_screens.first();
 }
 
+QQnxIntegration::Options QQnxIntegration::options() const
+{
+    return m_options;
+}
+
 bool QQnxIntegration::supportsNavigatorEvents() const
 {
     // If QQNX_PPS or Q_OS_BLACKBERRY is defined then we have navigator
diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h
index e3eb9e06ba..b083ad82f5 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.h
+++ b/src/plugins/platforms/qnx/qqnxintegration.h
@@ -80,7 +80,12 @@ typedef QHash<screen_window_t, QWindow *> QQnxWindowMapper;
 class QQnxIntegration : public QPlatformIntegration
 {
 public:
-    QQnxIntegration();
+    enum Option { // Options to be passed on command line.
+        NoOptions = 0x0,
+        FullScreenApplication = 0x1
+    };
+    Q_DECLARE_FLAGS(Options, Option)
+    explicit QQnxIntegration(const QStringList &paramList);
     ~QQnxIntegration();
 
     bool hasCapability(QPlatformIntegration::Capability cap) const;
@@ -129,6 +134,8 @@ public:
     void createDisplay(screen_display_t display, bool isPrimary);
     void removeDisplay(QQnxScreen *screen);
     QQnxScreen *primaryDisplay() const;
+    Options options() const;
+
 private:
     void createDisplays();
     void destroyDisplays();
@@ -164,6 +171,8 @@ private:
     static QQnxWindowMapper ms_windowMapper;
     static QMutex ms_windowMapperMutex;
 
+    const Options m_options;
+
     friend class QQnxWindow;
 };