Implement nativeResourceForIntegration() to get the display.
authorSamuel Rødal <samuel.rodal@nokia.com>
Fri, 13 Apr 2012 07:42:55 +0000 (09:42 +0200)
committerJørgen Lind <jorgen.lind@nokia.com>
Tue, 17 Apr 2012 11:07:52 +0000 (13:07 +0200)
Make it possible to get the display without a surface handle.

Change-Id: I9d0a2bcb4515b927f440902ad14e59f3506b84de
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
src/plugins/platforms/wayland/qwaylandnativeinterface.h

index a079b6e..bf40b75 100644 (file)
@@ -55,6 +55,16 @@ QWaylandNativeInterface::QWaylandNativeInterface(QWaylandIntegration *integratio
 {
 }
 
+void *QWaylandNativeInterface::nativeResourceForIntegration(const QByteArray &resourceString)
+{
+    QByteArray lowerCaseResource = resourceString.toLower();
+
+    if (lowerCaseResource == "display")
+        return m_integration->display()->wl_display();
+
+    return 0;
+}
+
 void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window)
 {
     QByteArray lowerCaseResource = resourceString.toLower();
index ef35508..bdfe8f2 100644 (file)
@@ -52,6 +52,7 @@ class QWaylandNativeInterface : public QPlatformNativeInterface
 {
 public:
     QWaylandNativeInterface(QWaylandIntegration *integration);
+    void *nativeResourceForIntegration(const QByteArray &resource);
     void *nativeResourceForWindow(const QByteArray &resourceString,
                                  QWindow *window);