Merge "Merge remote-tracking branch 'origin/master' into api_changes" into refs/staging/api_changes

1 files changed, 10 insertions, 1 deletions

diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index e3336d1c3a..badc229718 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -100,7 +100,8 @@ public:
         FrameDirty = 0x4,            //! Frame outdated by setStyle, recalculate in next query.
         OpenGLSurface = 0x10,
         OpenGLDoubleBuffered = 0x20,
-        OpenGlPixelFormatInitialized = 0x40
+        OpenGlPixelFormatInitialized = 0x40,
+        BlockedByModal = 0x80
     };
 
     struct WindowData
@@ -137,6 +138,8 @@ public:
     virtual void raise();
     virtual void lower();
 
+    void windowEvent(QEvent *event);
+
     virtual void propagateSizeHints();
     virtual QMargins frameMargins() const;
 
@@ -189,6 +192,12 @@ public:
     inline void setFlag(unsigned f) const   { m_flags |= f; }
     inline void clearFlag(unsigned f) const { m_flags &= ~f; }
 
+    void setEnabled(bool enabled);
+    bool isEnabled() const;
+
+    void alertWindow(int durationMs = 0);
+    void stopAlertWindow();
+
 private:
     inline void show_sys() const;
     inline void hide_sys() const;