From e79aa19f67b0dd0a5d2cd88ea4818664fbfb5932 Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Date: Fri, 8 Apr 2016 08:30:36 +0200
Subject: [PATCH] Rename QWaylandWindowManagerExtension to
 QWaylandQtWindowManager

 * QWaylandWindowManagerExtension become QWaylandQtWindowManager
 * WindowManager become QtWindowManager

Follow naming convention already established for other extensions
like QWaylandWlShell and avoid confusion that might arise with
a name as generic as WindowManager.

Use QWaylandClient rather than wl_client.

Also the Wayland protocol definition has been renamed
to qt-windowmanager.xml

Change-Id: I941621ce229327c21eff9e80c7e92205cc60e8eb
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
---
 .../extensions/{windowmanager.xml => qt-windowmanager.xml}      | 2 +-
 src/plugins/platforms/wayland/client.pro                        | 2 +-
 .../platforms/wayland/qwaylandwindowmanagerintegration_p.h      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/3rdparty/wayland/extensions/{windowmanager.xml => qt-windowmanager.xml} (98%)

diff --git a/src/3rdparty/wayland/extensions/windowmanager.xml b/src/3rdparty/wayland/extensions/qt-windowmanager.xml
similarity index 98%
rename from src/3rdparty/wayland/extensions/windowmanager.xml
rename to src/3rdparty/wayland/extensions/qt-windowmanager.xml
index 3d3bbd7fe71..86ddff72ec5 100644
--- a/src/3rdparty/wayland/extensions/windowmanager.xml
+++ b/src/3rdparty/wayland/extensions/qt-windowmanager.xml
@@ -1,4 +1,4 @@
-<protocol name="windowmanager">
+<protocol name="qt_windowmanager">
 
     <copyright>
  Copyright (C) 2015 The Qt Company Ltd.
diff --git a/src/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro
index 994cf544300..f0142c9a5b3 100644
--- a/src/plugins/platforms/wayland/client.pro
+++ b/src/plugins/platforms/wayland/client.pro
@@ -38,7 +38,7 @@ WAYLANDCLIENTSOURCES += \
             ../extensions/surface-extension.xml \
             ../extensions/touch-extension.xml \
             ../extensions/qtkey-extension.xml \
-            ../extensions/windowmanager.xml \
+            ../extensions/qt-windowmanager.xml \
             ../3rdparty/protocol/text-input-unstable-v2.xml \
             ../3rdparty/protocol/xdg-shell.xml \
 
diff --git a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
index 80513af3aaa..f2c0ac6be7a 100644
--- a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
+++ b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
@@ -57,7 +57,7 @@
 #include <wayland-client.h>
 #include <QtPlatformSupport/private/qgenericunixservices_p.h>
 
-#include <QtWaylandClient/private/qwayland-windowmanager.h>
+#include <QtWaylandClient/private/qwayland-qt-windowmanager.h>
 #include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE