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 <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>

1 files changed, 10 insertions, 13 deletions

diff --git a/src/widgets/kernel/qdesktopwidget_qpa.cpp b/src/widgets/kernel/qdesktopwidget_qpa.cpp
index 5e4dffb15d..380daee8c0 100644
--- a/src/widgets/kernel/qdesktopwidget_qpa.cpp
+++ b/src/widgets/kernel/qdesktopwidget_qpa.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qdesktopwidget.h"
+#include "qscreen.h"
 #include "private/qapplication_p.h"
 #include <QWidget>
 #include "private/qwidget_p.h"
@@ -51,7 +52,7 @@ QT_USE_NAMESPACE
 void QDesktopWidgetPrivate::updateScreenList()
 {
     Q_Q(QDesktopWidget);
-    QList<QPlatformScreen *> screenList = QGuiApplicationPrivate::platformIntegration()->screens();
+    QList<QScreen *> screenList = QGuiApplication::screens();
     int targetLength = screenList.length();
     int currentLength = screens.length();
 
@@ -97,7 +98,7 @@ QDesktopWidget::~QDesktopWidget()
 
 bool QDesktopWidget::isVirtualDesktop() const
 {
-    return QGuiApplicationPrivate::platformIntegration()->isVirtualDesktop();
+    return QGuiApplication::primaryScreen()->virtualSiblings().size() > 1;
 }
 
 int QDesktopWidget::primaryScreen() const
@@ -107,8 +108,7 @@ int QDesktopWidget::primaryScreen() const
 
 int QDesktopWidget::numScreens() const
 {
-    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
-    return qMax(pi->screens().size(), 1);
+    return qMax(QGuiApplication::screens().size(), 1);
 }
 
 QWidget *QDesktopWidget::screen(int screen)
@@ -121,26 +121,24 @@ QWidget *QDesktopWidget::screen(int screen)
 
 const QRect QDesktopWidget::availableGeometry(int screenNo) const
 {
-    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
-    QList<QPlatformScreen *> screens = pi->screens();
+    QList<QScreen *> screens = QGuiApplication::screens();
     if (screenNo == -1)
         screenNo = 0;
     if (screenNo < 0 || screenNo >= screens.size())
         return QRect();
     else
-        return screens[screenNo]->availableGeometry();
+        return screens.at(screenNo)->availableGeometry();
 }
 
 const QRect QDesktopWidget::screenGeometry(int screenNo) const
 {
-    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
-    QList<QPlatformScreen *> screens = pi->screens();
+    QList<QScreen *> screens = QGuiApplication::screens();
     if (screenNo == -1)
         screenNo = 0;
     if (screenNo < 0 || screenNo >= screens.size())
         return QRect();
     else
-        return screens[screenNo]->geometry();
+        return screens.at(screenNo)->geometry();
 }
 
 int QDesktopWidget::screenNumber(const QWidget *w) const
@@ -157,11 +155,10 @@ int QDesktopWidget::screenNumber(const QWidget *w) const
 
 int QDesktopWidget::screenNumber(const QPoint &p) const
 {
-    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
-    QList<QPlatformScreen *> screens = pi->screens();
+    QList<QScreen *> screens = QGuiApplication::screens();
 
     for (int i = 0; i < screens.size(); ++i)
-        if (screens[i]->geometry().contains(p))
+        if (screens.at(i)->geometry().contains(p))
             return i;
 
     return primaryScreen(); //even better would be closest screen