Move WindowType to QWindow.

(cherry picked from commit cfa7dc87bc962bd0f3a43a464723d74d87f997e2)

2 files changed, 11 insertions, 11 deletions

diff --git a/src/gui/kernel/qwindow_qpa.h b/src/gui/kernel/qwindow_qpa.h
index 62d8825236..35b26fb7a1 100644
--- a/src/gui/kernel/qwindow_qpa.h
+++ b/src/gui/kernel/qwindow_qpa.h
@@ -61,7 +61,15 @@ class Q_GUI_EXPORT QWindow : public QObject
     Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle)
 
 public:
-    QWindow(const QWindowFormat &format, QWindow *parent);
+    enum WindowType {
+        Window = 0x00000001,
+        Dialog = 0x00000002,
+        Popup = 0x00000004,
+        ToolTip = 0x00000008
+    };
+    Q_DECLARE_FLAGS(WindowTypes, WindowType)
+
+    QWindow(const QWindowFormat &format, WindowType type = Window, QWindow *parent = 0);
     void setVisible(bool visible);
     void create();
 
@@ -129,6 +137,8 @@ private:
     Q_DISABLE_COPY(QWindow)
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QWindow::WindowTypes)
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/gui/kernel/qwindowformat_qpa.h b/src/gui/kernel/qwindowformat_qpa.h
index b0989d70e9..d4eb09c897 100644
--- a/src/gui/kernel/qwindowformat_qpa.h
+++ b/src/gui/kernel/qwindowformat_qpa.h
@@ -60,16 +60,6 @@ public:
     };
     Q_DECLARE_FLAGS(FormatOptions, FormatOption)
 
-#if 0
-    enum WindowType {
-        Window = 0x00000001,
-        Dialog = 0x00000002,
-        Popup = 0x00000004,
-        ToolTip = 0x00000008
-    };
-    Q_DECLARE_FLAGS(WindowTypes, WindowType)
-#endif
-
     enum ColorFormat {
         InvalidColorFormat,
         RGB565,