diff options
| author | Samuel Rødal <[email protected]> | 2011-07-21 13:50:28 +0200 |
|---|---|---|
| committer | Jørgen Lind <[email protected]> | 2011-07-25 13:52:09 +0200 |
| commit | c3da77798b876716ce038a30e9aa8517ec158c47 (patch) | |
| tree | 99ac6cf5ce37fcb626a12857bb18cf9b444b27f2 /src/widgets/kernel/qwidget.cpp | |
| parent | e80b6619524a3720efb5fbe4c2307bec25a12ab8 (diff) | |
Added workable QScreen API on top of QPlatformScreen.
QPlatformIntegration::screens() no longer has to be implemented,
implementations should call QPlatformIntegration::screenAdded() for each
screen instead. This is for being able to support adding screens at
run-time later on, by connecting it to a signal in QGuiApplication.
The QGuiGLContext API has changed a bit, by not sending in all the
parameters in the constructor but instead having a create() function.
The createPlatformGLContext() factory in QPlatformIntegration takes a
QGuiGLContext * instead of a QSurfaceFormat and a share context, similar
to how the window and backing store factory functions work.
The XCB plugin has experimental support for connecting to multiple X
displays simultaneously, creating one or more QScreen for each.
Change-Id: I248a22a4fd3481280710110272c04a30a8021e8f
Reviewed-on: http://codereview.qt.nokia.com/2103
Reviewed-by: Qt Sanity Bot <[email protected]>
Reviewed-by: Jørgen Lind <[email protected]>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index a29a265e5a0..76218a9eb3e 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1266,8 +1266,7 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f) #elif defined(Q_WS_QPA) if (desktopWidget) { int screen = desktopWidget->d_func()->topData()->screenIndex; - QPlatformIntegration *platform = QGuiApplicationPrivate::platformIntegration(); - platform->moveToScreen(q->windowHandle(), screen); + q->windowHandle()->setScreen(QGuiApplication::screens().value(screen, 0)); } #else Q_UNUSED(desktopWidget); |
