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

Make qwaylandclientexport public

Browse Source 
...since it's being used by a public header.

Change-Id: I38049c27c8bd4dc793416bf836d79c4226172d38
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
This commit is contained in:
Paul Olav Tvete 2016-05-19 11:34:06 +02:00
parent 7efc23b8fb
commit 7f97e7116d
41 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,6 +106,7 @@ HEADERS += qwaylandintegration_p.h \
qwaylandinputcontext_p.h \ qwaylandinputcontext_p.h \
qwaylanddatadevice_p.h \ qwaylanddatadevice_p.h \
qwaylandshm_p.h \ qwaylandshm_p.h \
qwaylandclientexport.h \
../shared/qwaylandinputmethodeventbuilder_p.h \ ../shared/qwaylandinputmethodeventbuilder_p.h \
../shared/qwaylandmimehelper_p.h \ ../shared/qwaylandmimehelper_p.h \
../shared/qwaylandxkb_p.h \ ../shared/qwaylandxkb_p.h \

2
src/plugins/platforms/wayland/global/qwaylandclientextension.h
View File

@ -39,7 +39,7 @@
#include <QObject> #include <QObject>
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h
View File

@ -52,7 +52,7 @@
// //
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h
View File

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QStringList> #include <QtCore/QStringList>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h
View File

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/qplugin.h> #include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h> #include <QtCore/qfactoryinterface.h>

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h
View File

@ -52,7 +52,7 @@
// //
#include <QtWaylandClient/private/qwayland-hardware-integration.h> #include <QtWaylandClient/private/qwayland-hardware-integration.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h
View File

@ -55,7 +55,7 @@
#include <QtGui/qopengl.h> #include <QtGui/qopengl.h>
#include <QtWaylandClient/private/qwayland-server-buffer-extension.h> #include <QtWaylandClient/private/qwayland-server-buffer-extension.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h
View File

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QStringList> #include <QtCore/QStringList>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h
View File

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/qplugin.h> #include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h> #include <QtCore/qfactoryinterface.h>

2
src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h
View File

@ -52,7 +52,7 @@
// //
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <stdint.h> #include <stdint.h>

2
src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h
View File

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QStringList> #include <QtCore/QStringList>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h
View File

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/qplugin.h> #include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h> #include <QtCore/qfactoryinterface.h>

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

@ -59,7 +59,7 @@
#include <QtGui/QColor> #include <QtGui/QColor>
#include <QtGui/QStaticText> #include <QtGui/QStaticText>
#include <QtGui/QImage> #include <QtGui/QImage>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <wayland-client.h> #include <wayland-client.h>

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

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QSize> #include <QtCore/QSize>
#include <QtCore/QRect> #include <QtCore/QRect>

0
src/plugins/platforms/wayland/qwaylandclientexport_p.h → src/plugins/platforms/wayland/qwaylandclientexport.h
View File

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

@ -54,7 +54,7 @@
#include <qpa/qplatformclipboard.h> #include <qpa/qplatformclipboard.h>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -53,7 +53,7 @@
#include <qpa/qplatformcursor.h> #include <qpa/qplatformcursor.h>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
struct wl_cursor; struct wl_cursor;
struct wl_cursor_image; struct wl_cursor_image;

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

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -53,7 +53,7 @@
#include <QtGui/private/qdnd_p.h> #include <QtGui/private/qdnd_p.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -54,7 +54,7 @@
#include <QObject> #include <QObject>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QStringList> #include <QtCore/QStringList>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/qplugin.h> #include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h> #include <QtCore/qfactoryinterface.h>

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

@ -60,7 +60,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-xdg-shell.h> #include <QtWaylandClient/private/qwayland-xdg-shell.h>
#include <QtWaylandClient/private/qwaylandshm_p.h> #include <QtWaylandClient/private/qwaylandshm_p.h>

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

@ -57,7 +57,7 @@
#include <QtGui/QDrag> #include <QtGui/QDrag>
#include <QtCore/QMimeData> #include <QtCore/QMimeData>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -54,7 +54,7 @@
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <wayland-client.h> #include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-surface-extension.h> #include <QtWaylandClient/private/qwayland-surface-extension.h>

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

@ -53,7 +53,7 @@
#include <qpa/qplatformintegration.h> #include <qpa/qplatformintegration.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace QtWaylandClient { namespace QtWaylandClient {

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

@ -54,7 +54,7 @@
#include <QVariantMap> #include <QVariantMap>
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -53,7 +53,7 @@
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-qtkey-extension.h> #include <QtWaylandClient/private/qwayland-qtkey-extension.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -52,7 +52,7 @@
// //
#include <qpa/qplatformscreen.h> #include <qpa/qplatformscreen.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>

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

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

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

@ -54,7 +54,7 @@
#include <QVector> #include <QVector>
#include <QImage> #include <QImage>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -56,7 +56,7 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include <QtCore/qmutex.h> #include <QtCore/qmutex.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -54,7 +54,7 @@
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <QtWaylandClient/private/qwayland-touch-extension.h> #include <QtWaylandClient/private/qwayland-touch-extension.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -59,7 +59,7 @@
#include <qpa/qplatformwindow.h> #include <qpa/qplatformwindow.h>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
struct wl_egl_window; struct wl_egl_window;

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

@ -58,7 +58,7 @@
#include <QtPlatformSupport/private/qgenericunixservices_p.h> #include <QtPlatformSupport/private/qgenericunixservices_p.h>
#include <QtWaylandClient/private/qwayland-windowmanager.h> #include <QtWaylandClient/private/qwayland-windowmanager.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -56,7 +56,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include "qwaylandshellsurface_p.h" #include "qwaylandshellsurface_p.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -56,7 +56,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-xdg-shell.h> #include <QtWaylandClient/private/qwayland-xdg-shell.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include "qwaylandshellsurface_p.h" #include "qwaylandshellsurface_p.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -57,7 +57,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-xdg-shell.h> #include <QtWaylandClient/private/qwayland-xdg-shell.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include "qwaylandshellsurface_p.h" #include "qwaylandshellsurface_p.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
View File

@ -52,7 +52,7 @@
// //
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h
View File

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QStringList> #include <QtCore/QStringList>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h
View File

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/qplugin.h> #include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h> #include <QtCore/qfactoryinterface.h>