summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-07-09 14:04:46 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-07-09 14:04:46 (GMT)
commite7054204ff74bde531d293de5b360587724f6857 (patch)
treed334bfe4000ce606eb6e732923c915edfb7c3a07 /src/gui/kernel/qwidget.cpp
parentc7590d9f255e1efd3dc528e1052f997f4f477009 (diff)
downloadQt-e7054204ff74bde531d293de5b360587724f6857.zip
Qt-e7054204ff74bde531d293de5b360587724f6857.tar.gz
Qt-e7054204ff74bde531d293de5b360587724f6857.tar.bz2
Added QPlatformWindowFormat
Its mostly a copy of QGLFormat Only plugin that uses it is the openkode, and thats just a poc.
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
-rw-r--r--src/gui/kernel/qwidget.cpp37
1 files changed, 2 insertions, 35 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 53b35dd..943da79 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -1662,6 +1662,7 @@ void QWidgetPrivate::createTLExtra()
#endif
#if defined(Q_WS_QPA)
x->platformWindow = 0;
+ x->platformWindowFormat = QPlatformWindowFormat::defaultFormat();
#endif
}
}
@@ -2455,6 +2456,7 @@ void QWidgetPrivate::createWinId(WId winid)
q->create();
}
#else
+ Q_UNUSED(winid);
q->create();
#endif //Q_WS_QPA
@@ -11937,41 +11939,6 @@ QWindowSurface *QWidget::windowSurface() const
return bs ? bs->windowSurface : 0;
}
-#if defined(Q_WS_QPA)
-/*!
- \preliminary
-
- Sets the window to be the \a window specified.
- The QWidget takes ownership of the \a surface.
-*/
-void QWidget::setPlatformWindow(QPlatformWindow *window)
-{
- Q_D(QWidget);
-
- QTLWExtra *topData = d->topData();
- if (topData->platformWindow == window)
- return;
-
- delete topData->platformWindow;
- topData->platformWindow = window;
-}
-
-/*!
- \preliminary
-
- Returns the QPlatformWindow this widget will be drawn into.
-*/
-QPlatformWindow *QWidget::platformWindow() const
-{
- Q_D(const QWidget);
- QTLWExtra *extra = d->maybeTopData();
- if (extra && extra->platformWindow)
- return extra->platformWindow;
-
- return 0;
-}
-#endif //defined(Q_WS_QPA)
-
void QWidgetPrivate::getLayoutItemMargins(int *left, int *top, int *right, int *bottom) const
{
if (left)