Merge remote-tracking branch 'base/master' into refactor

Conflicts:
	demos/demos.pro
	demos/embedded/digiflip/digiflip.pro
	examples/examples.pro
	examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
	src/gui/kernel/qplatformglcontext_qpa.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
	src/plugins/platforms/wayland/qwaylanddisplay.cpp
	src/plugins/platforms/wayland/qwaylandwindow.cpp

Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745

5 files changed, 19 insertions, 15 deletions

diff --git a/src/plugins/platforms/wayland/qwaylandclipboard.cpp b/src/plugins/platforms/wayland/qwaylandclipboard.cpp
index feaa660bc6..da5da4285a 100644
--- a/src/plugins/platforms/wayland/qwaylandclipboard.cpp
+++ b/src/plugins/platforms/wayland/qwaylandclipboard.cpp
@@ -50,7 +50,7 @@
 #include <QtCore/QtDebug>
 #include <QtGui/private/qdnd_p.h>
 
-static QWaylandClipboard *clipboard;
+static QWaylandClipboard *clipboard = 0;
 
 class QWaylandMimeData : public QInternalMimeData
 {
@@ -162,10 +162,16 @@ void QWaylandSelection::cancelled(void *data, struct wl_selection *selection)
     delete static_cast<QWaylandSelection *>(data);
 }
 
+QWaylandClipboard *QWaylandClipboard::instance(QWaylandDisplay *display)
+{
+    if (!clipboard)
+        clipboard = new QWaylandClipboard(display);
+    return clipboard;
+}
+
 QWaylandClipboard::QWaylandClipboard(QWaylandDisplay *display)
     : mDisplay(display), mMimeDataIn(0), mOffer(0)
 {
-    clipboard = this;
 }
 
 QWaylandClipboard::~QWaylandClipboard()
diff --git a/src/plugins/platforms/wayland/qwaylandclipboard.h b/src/plugins/platforms/wayland/qwaylandclipboard.h
index f45fb8da4c..87294342d7 100644
--- a/src/plugins/platforms/wayland/qwaylandclipboard.h
+++ b/src/plugins/platforms/wayland/qwaylandclipboard.h
@@ -61,7 +61,8 @@ public slots:
 class QWaylandClipboard : public QPlatformClipboard
 {
 public:
-    QWaylandClipboard(QWaylandDisplay *display);
+    static QWaylandClipboard *instance(QWaylandDisplay *display);
+
     ~QWaylandClipboard();
 
     QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard);
@@ -75,6 +76,8 @@ public:
     QVariant retrieveData(const QString &mimeType, QVariant::Type type) const;
 
 private:
+    QWaylandClipboard(QWaylandDisplay *display);
+
     static void offer(void *data,
                       struct wl_selection_offer *selection_offer,
                       const char *type);
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index 9e8cfe3df6..f3e2e9fb94 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -125,9 +125,14 @@ const struct wl_shell_listener QWaylandDisplay::shellListener = {
     QWaylandDisplay::shellHandleConfigure,
 };
 
+static QWaylandDisplay *display = 0;
+
 QWaylandDisplay::QWaylandDisplay(void)
     : argb_visual(0), premultiplied_argb_visual(0), rgb_visual(0)
 {
+    display = this;
+    qRegisterMetaType<uint32_t>("uint32_t");
+
     mDisplay = wl_display_connect(NULL);
     if (mDisplay == NULL) {
         qErrnoWarning(errno, "Failed to create display");
@@ -146,8 +151,6 @@ QWaylandDisplay::QWaylandDisplay(void)
 
     blockingReadEvents();
 
-    qRegisterMetaType<uint32_t>("uint32_t");
-
 #ifdef QT_WAYLAND_GL_SUPPORT
     mEglIntegration->initialize();
 #endif
@@ -311,11 +314,7 @@ void QWaylandDisplay::displayHandleGlobal(uint32_t id,
             new QWaylandInputDevice(mDisplay, id);
         mInputDevices.append(inputDevice);
     } else if (interface == "wl_selection_offer") {
-        QPlatformIntegration *plat = QGuiApplicationPrivate::platformIntegration();
-        if (!plat)
-            return;
-        QWaylandClipboard *clipboard = static_cast<QWaylandClipboard *>(plat->clipboard());
-        clipboard->createSelectionOffer(id);
+        QWaylandClipboard::instance(display)->createSelectionOffer(id);
     }
 }
 
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp
index 1f1ecda0e6..9a581c265f 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -64,7 +64,6 @@ QWaylandIntegration::QWaylandIntegration()
     : mFontDb(new QGenericUnixFontDatabase())
     , mDisplay(new QWaylandDisplay())
     , mNativeInterface(new QWaylandNativeInterface)
-    , mClipboard(0)
 {
 }
 
@@ -137,7 +136,5 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const
 
 QPlatformClipboard *QWaylandIntegration::clipboard() const
 {
-    if (!mClipboard)
-        mClipboard = new QWaylandClipboard(mDisplay);
-    return mClipboard;
+    return QWaylandClipboard::instance(mDisplay);
 }
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.h b/src/plugins/platforms/wayland/qwaylandintegration.h
index 6a5e4d3b28..c08c040261 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.h
+++ b/src/plugins/platforms/wayland/qwaylandintegration.h
@@ -74,7 +74,6 @@ private:
     QPlatformFontDatabase *mFontDb;
     QWaylandDisplay *mDisplay;
     QPlatformNativeInterface *mNativeInterface;
-    mutable QPlatformClipboard *mClipboard;
 };
 
 QT_END_NAMESPACE