Merge remote-tracking branch 'origin/dev' into stable

Conflicts:
	src/compositor/wayland_wrapper/qwlsurface.cpp

Change-Id: I3b6a4af41f272d3dc7fc920ba2542f2dd7978175

5 files changed, 29 insertions, 29 deletions

diff --git a/examples/server-buffer/client/main.cpp b/examples/server-buffer/client/main.cpp
index b5ce8aec3..1880f2160 100644
--- a/examples/server-buffer/client/main.cpp
+++ b/examples/server-buffer/client/main.cpp
@@ -128,7 +128,7 @@ public slots:
 
             const QSizeF buffer_size = m_server_buffer_list.at(i)->size();
             qreal scale_x = buffer_size.width() / width();
-            qreal scale_y = buffer_size.height() / height();
+            qreal scale_y = buffer_size.height() / height() * - 1;
             qreal translate_left = (((buffer_size.width() / 2) / width()) * 2) - 1;
             qreal translate_top = -(((buffer_size.height() / 2) / height()) * 2) + 1;
             qreal translate_x = translate_left + ((x / width())*2);
diff --git a/examples/server-buffer/client/serverbufferrenderer.cpp b/examples/server-buffer/client/serverbufferrenderer.cpp
index b9aa7a018..9eafddd63 100644
--- a/examples/server-buffer/client/serverbufferrenderer.cpp
+++ b/examples/server-buffer/client/serverbufferrenderer.cpp
@@ -43,10 +43,10 @@
 #include <QtGui/QOpenGLVertexArrayObject>
 #include <QtGui/QOpenGLShaderProgram>
 static const GLfloat uv_coords[] = {
-    1,1,
-    1,0,
-    0,1,
     0,0,
+    0,1,
+    1,0,
+    1,1,
 };
 
 static const GLfloat vertex_coords[] = {
diff --git a/examples/server-buffer/compositor/main.cpp b/examples/server-buffer/compositor/main.cpp
index bf93c4838..23e337d24 100644
--- a/examples/server-buffer/compositor/main.cpp
+++ b/examples/server-buffer/compositor/main.cpp
@@ -55,7 +55,7 @@
 
 #include "qwayland-server-share-buffer.h"
 #include <QtCompositor/private/qwlcompositor_p.h>
-#include <QtCompositor/qwaylandserverbufferintegration.h>
+#include <QtCompositor/private/qwlserverbufferintegration_p.h>
 
 #include "serverbufferitem.h"
 
@@ -111,14 +111,7 @@ public slots:
 private slots:
     void surfaceMapped() {
         QWaylandSurface *surface = qobject_cast<QWaylandSurface *>(sender());
-
-        QWaylandSurfaceItem *item = surface->surfaceItem();
-        if (!item) {
-            item = new QWaylandSurfaceItem(surface, rootObject());
-            item->setUseTextureAlpha(true);
-        }
-
-        item->setTouchEventsEnabled(true);
+        QQuickItem *item = surface->surfaceItem();
         emit windowAdded(QVariant::fromValue(static_cast<QQuickItem *>(item)));
     }
 
@@ -145,12 +138,12 @@ private slots:
 
         openglContext()->makeCurrent(this);
 
-        QWaylandServerBufferIntegration *sbi = QWaylandCompositor::handle()->serverBufferIntegration();
+        QtWayland::ServerBufferIntegration *sbi = QWaylandCompositor::handle()->serverBufferIntegration();
         if (!sbi) {
             qWarning("Could not find a Server Buffer Integration");
             return;
         }
-        if (sbi->supportsFormat(QWaylandServerBuffer::RGBA32)) {
+        if (sbi->supportsFormat(QtWayland::ServerBuffer::RGBA32)) {
                 QImage image(100,100,QImage::Format_ARGB32_Premultiplied);
                 image.fill(QColor(0x55,0x0,0x55,0x01));
                 {
@@ -169,7 +162,7 @@ private slots:
                 }
                 image = image.convertToFormat(QImage::Format_RGBA8888);
 
-                m_server_buffer_32_bit = sbi->createServerBuffer(image.size(),QWaylandServerBuffer::RGBA32);
+                m_server_buffer_32_bit = sbi->createServerBuffer(image.size(),QtWayland::ServerBuffer::RGBA32);
 
                 GLuint texture_32_bit;
                 glGenTextures(1, &texture_32_bit);
@@ -183,13 +176,13 @@ private slots:
 
         }
 
-        if (sbi->supportsFormat(QWaylandServerBuffer::A8)) {
+        if (sbi->supportsFormat(QtWayland::ServerBuffer::A8)) {
             QRawFont defaultRaw = QRawFont::fromFont(QFont(), QFontDatabase::Latin);
-            QVector<quint32> index = defaultRaw.glyphIndexesForString(QStringLiteral("A"));
+            QVector<quint32> index = defaultRaw.glyphIndexesForString(QStringLiteral("R"));
             QDistanceField distanceField(defaultRaw, index.front(), true);
             QImage img = distanceField.toImage(QImage::Format_Indexed8);
 
-            m_server_buffer_8_bit = sbi->createServerBuffer(img.size(), QWaylandServerBuffer::A8);
+            m_server_buffer_8_bit = sbi->createServerBuffer(img.size(), QtWayland::ServerBuffer::A8);
             GLuint texture_8_bit;
             glGenTextures(1, &texture_8_bit);
             glBindTexture(GL_TEXTURE_2D, texture_8_bit);
@@ -221,6 +214,10 @@ protected:
     }
 
     void surfaceCreated(QWaylandSurface *surface) {
+        QWaylandSurfaceItem *item = new QWaylandSurfaceItem(surface, rootObject());
+        item->setUseTextureAlpha(true);
+        item->setTouchEventsEnabled(true);
+
         connect(surface, SIGNAL(destroyed(QObject *)), this, SLOT(surfaceDestroyed(QObject *)));
         connect(surface, SIGNAL(mapped()), this, SLOT(surfaceMapped()));
         connect(surface,SIGNAL(unmapped()), this,SLOT(surfaceUnmapped()));
@@ -243,9 +240,9 @@ protected:
     }
 
 private:
-    QWaylandServerBuffer *m_server_buffer_32_bit;
+    QtWayland::ServerBuffer *m_server_buffer_32_bit;
     ServerBufferItem *m_server_buffer_item_32_bit;
-    QWaylandServerBuffer *m_server_buffer_8_bit;
+    QtWayland::ServerBuffer *m_server_buffer_8_bit;
     ServerBufferItem *m_server_buffer_item_8_bit;
 };
 
diff --git a/examples/server-buffer/compositor/serverbufferitem.cpp b/examples/server-buffer/compositor/serverbufferitem.cpp
index 8227b8716..4a47c279d 100644
--- a/examples/server-buffer/compositor/serverbufferitem.cpp
+++ b/examples/server-buffer/compositor/serverbufferitem.cpp
@@ -45,11 +45,11 @@
 #include <QtQuick/QSGSimpleTextureNode>
 #include <QtQuick/QQuickWindow>
 
-#include <QtCompositor/qwaylandserverbufferintegration.h>
+#include <QtCompositor/private/qwlserverbufferintegration_p.h>
 
 QT_BEGIN_NAMESPACE
 
-ServerBufferItem::ServerBufferItem(QWaylandServerBuffer *serverBuffer, QQuickItem *parent)
+ServerBufferItem::ServerBufferItem(QtWayland::ServerBuffer *serverBuffer, QQuickItem *parent)
     : QQuickItem(parent)
     , m_server_buffer(serverBuffer)
     , m_provider(new ServerBufferTextureProvider)
@@ -72,7 +72,7 @@ bool ServerBufferItem::isYInverted() const
 
 int ServerBufferItem::depth() const
 {
-    return m_server_buffer->format() == QWaylandServerBuffer::RGBA32 ? 32 : 8;
+    return m_server_buffer->format() == QtWayland::ServerBuffer::RGBA32 ? 32 : 8;
 }
 
 QSGTextureProvider *ServerBufferItem::textureProvider() const
diff --git a/examples/server-buffer/compositor/serverbufferitem.h b/examples/server-buffer/compositor/serverbufferitem.h
index 9391cb942..31fad4e86 100644
--- a/examples/server-buffer/compositor/serverbufferitem.h
+++ b/examples/server-buffer/compositor/serverbufferitem.h
@@ -49,21 +49,24 @@
 QT_BEGIN_NAMESPACE
 
 class ServerBufferTextureProvider;
-class QWaylandServerBuffer;
+
+namespace QtWayland {
+class ServerBuffer;
+}
 
 class ServerBufferItem : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(QWaylandServerBuffer *serverBuffer READ serverBuffer CONSTANT)
+    Q_PROPERTY(QtWayland::ServerBuffer *serverBuffer READ serverBuffer CONSTANT)
     Q_PROPERTY(bool useTextureAlpha READ useTextureAlpha WRITE setUseTextureAlpha NOTIFY useTextureAlphaChanged)
     Q_PROPERTY(bool isYInverted READ isYInverted NOTIFY yInvertedChanged)
     Q_PROPERTY(int depth READ depth CONSTANT)
 
 public:
-    ServerBufferItem(QWaylandServerBuffer *serverBuffer, QQuickItem *parent = 0);
+    ServerBufferItem(QtWayland::ServerBuffer *serverBuffer, QQuickItem *parent = 0);
     ~ServerBufferItem();
 
-    QWaylandServerBuffer *serverBuffer() const { return m_server_buffer; }
+    QtWayland::ServerBuffer *serverBuffer() const { return m_server_buffer; }
 
     bool isYInverted() const;
     int depth() const;
@@ -86,7 +89,7 @@ protected:
 
 private:
     void updateTexture();
-    QWaylandServerBuffer *m_server_buffer;
+    QtWayland::ServerBuffer *m_server_buffer;
     ServerBufferTextureProvider *m_provider;
     bool m_useTextureAlpha;
 };