3 files changed, 9 insertions, 17 deletions
diff --git a/src/plugins/platforms/offscreen/qoffscreencommon.h b/src/plugins/platforms/offscreen/qoffscreencommon.h
index 72d6f16d26..1a9d65972d 100644
--- a/src/plugins/platforms/offscreen/qoffscreencommon.h
+++ b/src/plugins/platforms/offscreen/qoffscreencommon.h
@@ -75,7 +75,6 @@ public:
 class QOffscreenDrag : public QPlatformDrag
 {
 public:
-    QMimeData *platformDropData() Q_DECL_OVERRIDE { return 0; }
     Qt::DropAction drag(QDrag *) Q_DECL_OVERRIDE { return Qt::IgnoreAction; }
 };
 #endif
diff --git a/src/plugins/platforms/offscreen/qoffscreenwindow.cpp b/src/plugins/platforms/offscreen/qoffscreenwindow.cpp
index 81f262f9ed..832e94034d 100644
--- a/src/plugins/platforms/offscreen/qoffscreenwindow.cpp
+++ b/src/plugins/platforms/offscreen/qoffscreenwindow.cpp
@@ -56,7 +56,7 @@ QOffscreenWindow::QOffscreenWindow(QWindow *window)
     if (window->windowState() == Qt::WindowNoState)
         setGeometry(window->geometry());
     else
-        setWindowState(window->windowState());
+        setWindowState(window->windowStates());
 
     QWindowSystemInterface::flushWindowSystemEvents();
 
@@ -166,26 +166,19 @@ void QOffscreenWindow::setFrameMarginsEnabled(bool enabled)
     }
 }
 
-void QOffscreenWindow::setWindowState(Qt::WindowState state)
+void QOffscreenWindow::setWindowState(Qt::WindowStates state)
 {
-    setFrameMarginsEnabled(state != Qt::WindowFullScreen);
+    setFrameMarginsEnabled(!(state & Qt::WindowFullScreen));
     m_positionIncludesFrame = false;
 
-    switch (state) {
-    case Qt::WindowFullScreen:
+    if (state & Qt::WindowMinimized)
+        ; // nothing to do
+    else if (state & Qt::WindowFullScreen)
         setGeometryImpl(screen()->geometry());
-        break;
-    case Qt::WindowMaximized:
+    else if (state & Qt::WindowMaximized)
         setGeometryImpl(screen()->availableGeometry().adjusted(m_margins.left(), m_margins.top(), -m_margins.right(), -m_margins.bottom()));
-        break;
-    case Qt::WindowMinimized:
-        break;
-    case Qt::WindowNoState:
+    else
         setGeometryImpl(m_normalGeometry);
-        break;
-    default:
-        break;
-    }
 
     QWindowSystemInterface::handleWindowStateChanged(window(), state);
 }
diff --git a/src/plugins/platforms/offscreen/qoffscreenwindow.h b/src/plugins/platforms/offscreen/qoffscreenwindow.h
index f75458eb8e..0dced9680a 100644
--- a/src/plugins/platforms/offscreen/qoffscreenwindow.h
+++ b/src/plugins/platforms/offscreen/qoffscreenwindow.h
@@ -54,7 +54,7 @@ public:
     ~QOffscreenWindow();
 
     void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
-    void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE;
+    void setWindowState(Qt::WindowStates states) Q_DECL_OVERRIDE;
 
     QMargins frameMargins() const Q_DECL_OVERRIDE;