diff options
author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-06-22 13:33:27 +0200 |
---|---|---|
committer | Morten Sorvig <morten.sorvig@nokia.com> | 2011-06-22 14:10:26 +0200 |
commit | def5901955e8b4cfcb9e2cd83c7dcf9ed0508a0a (patch) | |
tree | c5e5dd1e8ecfd1ff8acf48130909b0412f84b728 /src/gui/kernel | |
parent | 0e4844aa243396aa2af4b89e94919854f142f52e (diff) |
Reintroduce QWindow::SurfaceType
On Cocoa it makes sense to distinguish between the
two window types.
Reviewed-by: Samuel
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qwindow.cpp | 12 | ||||
-rw-r--r-- | src/gui/kernel/qwindow.h | 5 | ||||
-rw-r--r-- | src/gui/kernel/qwindow_p.h | 2 |
3 files changed, 19 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index d060adf89e..7fa9316878 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -72,6 +72,18 @@ QWindow::~QWindow() destroy(); } +void QWindow::setSurfaceType(SurfaceType surfaceType) +{ + Q_D(QWindow); + d->surfaceType = surfaceType; +} + +QWindow::SurfaceType QWindow::surfaceType() const +{ + Q_D(const QWindow); + return d->surfaceType; +} + void QWindow::setVisible(bool visible) { Q_D(QWindow); diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 20b6074274..67330e5291 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -100,9 +100,14 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle) public: + enum SurfaceType { RasterSurface, OpenGLSurface }; + QWindow(QWindow *parent = 0); virtual ~QWindow(); + void setSurfaceType(SurfaceType surfaceType); + SurfaceType surfaceType() const; + void setVisible(bool visible); bool visible() const; diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index a8b118319d..cca20bc30a 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -59,6 +59,7 @@ class Q_GUI_EXPORT QWindowPrivate : public QObjectPrivate public: QWindowPrivate() : QObjectPrivate() + , surfaceType(QWindow::RasterSurface) , windowFlags(Qt::Window) , parentWindow(0) , platformWindow(0) @@ -75,6 +76,7 @@ public: { } + QWindow::SurfaceType surfaceType; Qt::WindowFlags windowFlags; QWindow *parentWindow; QPlatformWindow *platformWindow; |