Move WindowType to QWindow.

(cherry picked from commit cfa7dc87bc962bd0f3a43a464723d74d87f997e2)
This commit is contained in:
Samuel Rødal 2011-04-26 10:02:06 +02:00
parent 498f938f2d
commit 6d28965b10
2 changed files with 11 additions and 11 deletions

View File

@ -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

View File

@ -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,