Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration

* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (69 commits)
  Lighthouse: License headers to new files in testlite
  Make sure we blit the fbo on flush in QGLWindowSurface
  Lighthouse: Wayland. Make the wayland integration closer to Lighthosue
  Lighthouse: Wayland, only make one fbo for the WaylandPaintDevice
  Making clearer separation between responsibility of different classes
  Make it possible to vertically mirror gl painting
  Lighthouse:Wayland Moving some logic into files
  Fix Wayland plugin to work with Wayland after some interfaces changed
  Make QGLContext::fromPlatformGLContext show correct sharing
  Remove Lighthouse specific code from QGLWindowSurface
  Fix X11 clipboard bug.
  Fix for uninitialized member in QWaylandCursor
  wayland: use pkgconfig for libdrm in wayland.pro
  wayland: remove non-public header from config.tests
  wayland: fix SOURCES to point to wayland.cpp in config.tests
  Wayland: request rbg and premultiplied argb visuals as needed
  Wayland: clamp window resizes to screen size
  Wayland: split GL code into separate files
  Wayland: use correct viewport for swapBuffers and correct coords
  Wayland: fix geometry of swapBuffers
  ...

1 files changed, 99 insertions, 0 deletions

diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp
new file mode 100644
index 0000000..02bc680
--- /dev/null
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwaylandintegration.h"
+
+#include "qwaylanddisplay.h"
+#include "qwaylandshmsurface.h"
+#include "qwaylanddrmsurface.h"
+#include "qwaylandwindow.h"
+
+#include "qfontconfigdatabase.h"
+
+#include <QtGui/QWindowSystemInterface>
+#include <QtGui/QPlatformCursor>
+#include <QtGui/QPlatformWindowFormat>
+
+#include <QtGui/private/qpixmap_raster_p.h>
+#include <QtOpenGL/private/qpixmapdata_gl_p.h>
+
+QWaylandIntegration::QWaylandIntegration(bool useOpenGL)
+    : mFontDb(new QFontconfigDatabase())
+    , mDisplay(new QWaylandDisplay())
+    , mUseOpenGL(useOpenGL)
+{
+}
+
+QList<QPlatformScreen *>
+QWaylandIntegration::screens() const
+{
+    return mDisplay->screens();
+}
+
+QPixmapData *QWaylandIntegration::createPixmapData(QPixmapData::PixelType type) const
+{
+    if (mUseOpenGL)
+        return new QGLPixmapData(type);
+    return new QRasterPixmapData(type);
+}
+
+
+
+QPlatformWindow *QWaylandIntegration::createPlatformWindow(QWidget *widget, WId winId) const
+{
+    Q_UNUSED(winId);
+    return new QWaylandWindow(widget);
+}
+
+QWindowSurface *QWaylandIntegration::createWindowSurface(QWidget *widget, WId winId) const
+{
+    Q_UNUSED(winId);
+    Q_UNUSED(winId);
+
+    if (mUseOpenGL)
+        return new QWaylandDrmWindowSurface(widget);
+    return new QWaylandShmWindowSurface(widget);
+}
+
+QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const
+{
+    return mFontDb;
+}