1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename QWaylandWindowManagerExtension to QWaylandQtWindowManager

Browse Source 
* 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>
This commit is contained in:
Pier Luigi Fiorini 2016-04-08 08:30:36 +02:00
parent f3df72594e
commit e79aa19f67
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/wayland/extensions/windowmanager.xml → src/3rdparty/wayland/extensions/qt-windowmanager.xml vendored
View File

@ -1,4 +1,4 @@
<protocol name="windowmanager"> <protocol name="qt_windowmanager">
<copyright> <copyright>
Copyright (C) 2015 The Qt Company Ltd. Copyright (C) 2015 The Qt Company Ltd.

2
src/plugins/platforms/wayland/client.pro
View File

@ -38,7 +38,7 @@ WAYLANDCLIENTSOURCES += \
../extensions/surface-extension.xml \ ../extensions/surface-extension.xml \
../extensions/touch-extension.xml \ ../extensions/touch-extension.xml \
../extensions/qtkey-extension.xml \ ../extensions/qtkey-extension.xml \
../extensions/windowmanager.xml \ ../extensions/qt-windowmanager.xml \
../3rdparty/protocol/text-input-unstable-v2.xml \ ../3rdparty/protocol/text-input-unstable-v2.xml \
../3rdparty/protocol/xdg-shell.xml \ ../3rdparty/protocol/xdg-shell.xml \

2
src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
View File

@ -57,7 +57,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include <QtPlatformSupport/private/qgenericunixservices_p.h> #include <QtPlatformSupport/private/qgenericunixservices_p.h>
#include <QtWaylandClient/private/qwayland-windowmanager.h> #include <QtWaylandClient/private/qwayland-qt-windowmanager.h>
#include <QtWaylandClient/qwaylandclientexport.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE