diff options
author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-19 11:34:06 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-19 12:00:27 +0000 |
commit | ca7d95494ccac9bc26c1edee86fc5b9229fa5e3e (patch) | |
tree | 9a3418c0ddf38df47d5327032b6d52f3b8c62cd6 | |
parent | 8959ccf51ddd61f89ba96f4abf64b5fd41e0d93e (diff) |
Make qwaylandclientexport public
...since it's being used by a public header.
Change-Id: I38049c27c8bd4dc793416bf836d79c4226172d38
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
41 files changed, 40 insertions, 39 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index 500a757f9..994cf5443 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -106,6 +106,7 @@ HEADERS += qwaylandintegration_p.h \ qwaylandinputcontext_p.h \ qwaylanddatadevice_p.h \ qwaylandshm_p.h \ + qwaylandclientexport.h \ ../shared/qwaylandinputmethodeventbuilder_p.h \ ../shared/qwaylandmimehelper_p.h \ ../shared/qwaylandxkb_p.h \ diff --git a/src/client/global/qwaylandclientextension.h b/src/client/global/qwaylandclientextension.h index b9a3017d9..7fd1132cc 100644 --- a/src/client/global/qwaylandclientextension.h +++ b/src/client/global/qwaylandclientextension.h @@ -39,7 +39,7 @@ #include <QObject> #include <qpa/qwindowsysteminterface.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtWaylandClient/private/qwayland-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h b/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h index 342742c3e..adaf2902a 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h +++ b/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h @@ -52,7 +52,7 @@ // #include <QtCore/qglobal.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h index 0a5d35616..c70a2bd56 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h +++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h index 39a037967..2830f95fa 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h +++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h index 3b8028eac..92748c9f0 100644 --- a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h +++ b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h @@ -52,7 +52,7 @@ // #include <QtWaylandClient/private/qwayland-hardware-integration.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h index 11ea36bc9..e3943da80 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h @@ -55,7 +55,7 @@ #include <QtGui/qopengl.h> #include <QtWaylandClient/private/qwayland-server-buffer-extension.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h index 91871fad2..f17856208 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h index 8a074fb21..7eaaa1700 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/client/inputdeviceintegration/qwaylandinputdeviceintegration_p.h b/src/client/inputdeviceintegration/qwaylandinputdeviceintegration_p.h index 21d0c8bd8..ada63b713 100644 --- a/src/client/inputdeviceintegration/qwaylandinputdeviceintegration_p.h +++ b/src/client/inputdeviceintegration/qwaylandinputdeviceintegration_p.h @@ -52,7 +52,7 @@ // #include <QtCore/qglobal.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <stdint.h> diff --git a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h index 4431529ff..d6d0e843c 100644 --- a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h +++ b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h index cea178c49..c4a578d2e 100644 --- a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h +++ b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/client/qwaylandabstractdecoration_p.h b/src/client/qwaylandabstractdecoration_p.h index 6e4113eff..3220dab9c 100644 --- a/src/client/qwaylandabstractdecoration_p.h +++ b/src/client/qwaylandabstractdecoration_p.h @@ -59,7 +59,7 @@ #include <QtGui/QColor> #include <QtGui/QStaticText> #include <QtGui/QImage> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <wayland-client.h> diff --git a/src/client/qwaylandbuffer_p.h b/src/client/qwaylandbuffer_p.h index 7dd920acc..8d651f823 100644 --- a/src/client/qwaylandbuffer_p.h +++ b/src/client/qwaylandbuffer_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtCore/QSize> #include <QtCore/QRect> diff --git a/src/client/qwaylandclientexport_p.h b/src/client/qwaylandclientexport.h index f49f1aee9..f49f1aee9 100644 --- a/src/client/qwaylandclientexport_p.h +++ b/src/client/qwaylandclientexport.h diff --git a/src/client/qwaylandclipboard_p.h b/src/client/qwaylandclipboard_p.h index 08d4baabd..aa008eef9 100644 --- a/src/client/qwaylandclipboard_p.h +++ b/src/client/qwaylandclipboard_p.h @@ -54,7 +54,7 @@ #include <qpa/qplatformclipboard.h> #include <QtCore/QVariant> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandcursor_p.h b/src/client/qwaylandcursor_p.h index a54841a28..4154ee191 100644 --- a/src/client/qwaylandcursor_p.h +++ b/src/client/qwaylandcursor_p.h @@ -53,7 +53,7 @@ #include <qpa/qplatformcursor.h> #include <QtCore/QMap> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> struct wl_cursor; struct wl_cursor_image; diff --git a/src/client/qwaylanddatadevicemanager_p.h b/src/client/qwaylanddatadevicemanager_p.h index 360605293..0c1d95d82 100644 --- a/src/client/qwaylanddatadevicemanager_p.h +++ b/src/client/qwaylanddatadevicemanager_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtWaylandClient/private/qwayland-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylanddataoffer_p.h b/src/client/qwaylanddataoffer_p.h index 534d79d7f..5e635c1a0 100644 --- a/src/client/qwaylanddataoffer_p.h +++ b/src/client/qwaylanddataoffer_p.h @@ -53,7 +53,7 @@ #include <QtGui/private/qdnd_p.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtWaylandClient/private/qwayland-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylanddatasource_p.h b/src/client/qwaylanddatasource_p.h index ec3f0aacc..c099ff62a 100644 --- a/src/client/qwaylanddatasource_p.h +++ b/src/client/qwaylanddatasource_p.h @@ -54,7 +54,7 @@ #include <QObject> #include <QtWaylandClient/private/qwayland-wayland.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylanddecorationfactory_p.h b/src/client/qwaylanddecorationfactory_p.h index 4797f2336..9d4e7a9fb 100644 --- a/src/client/qwaylanddecorationfactory_p.h +++ b/src/client/qwaylanddecorationfactory_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylanddecorationplugin_p.h b/src/client/qwaylanddecorationplugin_p.h index c5baa83f7..dd33f3416 100644 --- a/src/client/qwaylanddecorationplugin_p.h +++ b/src/client/qwaylanddecorationplugin_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index 618e57c59..59b005743 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -60,7 +60,7 @@ #include <wayland-client.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/qwaylandshm_p.h> diff --git a/src/client/qwaylanddnd_p.h b/src/client/qwaylanddnd_p.h index 294243753..2ff00b9ff 100644 --- a/src/client/qwaylanddnd_p.h +++ b/src/client/qwaylanddnd_p.h @@ -57,7 +57,7 @@ #include <QtGui/QDrag> #include <QtCore/QMimeData> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandextendedsurface_p.h b/src/client/qwaylandextendedsurface_p.h index c004a9f7b..39b85438a 100644 --- a/src/client/qwaylandextendedsurface_p.h +++ b/src/client/qwaylandextendedsurface_p.h @@ -54,7 +54,7 @@ #include <QtCore/QString> #include <QtCore/QVariant> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <wayland-client.h> #include <QtWaylandClient/private/qwayland-surface-extension.h> diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h index 630ac090b..4ee6fac8e 100644 --- a/src/client/qwaylandintegration_p.h +++ b/src/client/qwaylandintegration_p.h @@ -53,7 +53,7 @@ #include <qpa/qplatformintegration.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE namespace QtWaylandClient { diff --git a/src/client/qwaylandnativeinterface_p.h b/src/client/qwaylandnativeinterface_p.h index 71194da33..61c5e59d5 100644 --- a/src/client/qwaylandnativeinterface_p.h +++ b/src/client/qwaylandnativeinterface_p.h @@ -54,7 +54,7 @@ #include <QVariantMap> #include <qpa/qplatformnativeinterface.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandqtkey_p.h b/src/client/qwaylandqtkey_p.h index c746dc925..b749bd5f9 100644 --- a/src/client/qwaylandqtkey_p.h +++ b/src/client/qwaylandqtkey_p.h @@ -53,7 +53,7 @@ #include <qpa/qwindowsysteminterface.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtWaylandClient/private/qwayland-qtkey-extension.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandscreen_p.h b/src/client/qwaylandscreen_p.h index b4fa12e47..12b680640 100644 --- a/src/client/qwaylandscreen_p.h +++ b/src/client/qwaylandscreen_p.h @@ -52,7 +52,7 @@ // #include <qpa/qplatformscreen.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtWaylandClient/private/qwayland-wayland.h> diff --git a/src/client/qwaylandshellsurface_p.h b/src/client/qwaylandshellsurface_p.h index 053be3b5f..63b77ab33 100644 --- a/src/client/qwaylandshellsurface_p.h +++ b/src/client/qwaylandshellsurface_p.h @@ -57,7 +57,7 @@ #include <wayland-client.h> #include <QtWaylandClient/private/qwayland-wayland.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandshm_p.h b/src/client/qwaylandshm_p.h index 80d2b9492..aafe44632 100644 --- a/src/client/qwaylandshm_p.h +++ b/src/client/qwaylandshm_p.h @@ -54,7 +54,7 @@ #include <QVector> #include <QImage> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtWaylandClient/private/qwayland-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandsubsurface_p.h b/src/client/qwaylandsubsurface_p.h index b5f869bf2..0abd168bc 100644 --- a/src/client/qwaylandsubsurface_p.h +++ b/src/client/qwaylandsubsurface_p.h @@ -56,7 +56,7 @@ #include <QtCore/qglobal.h> #include <QtCore/qmutex.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtWaylandClient/private/qwayland-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandtouch_p.h b/src/client/qwaylandtouch_p.h index 8aa06d3ec..dc32b84a0 100644 --- a/src/client/qwaylandtouch_p.h +++ b/src/client/qwaylandtouch_p.h @@ -54,7 +54,7 @@ #include <qpa/qwindowsysteminterface.h> #include <QtWaylandClient/private/qwayland-touch-extension.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index f36f0833b..100c068fa 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -59,7 +59,7 @@ #include <qpa/qplatformwindow.h> #include <QtWaylandClient/private/qwayland-wayland.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> struct wl_egl_window; diff --git a/src/client/qwaylandwindowmanagerintegration_p.h b/src/client/qwaylandwindowmanagerintegration_p.h index 344960d57..80513af3a 100644 --- a/src/client/qwaylandwindowmanagerintegration_p.h +++ b/src/client/qwaylandwindowmanagerintegration_p.h @@ -58,7 +58,7 @@ #include <QtPlatformSupport/private/qgenericunixservices_p.h> #include <QtWaylandClient/private/qwayland-windowmanager.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandwlshellsurface_p.h b/src/client/qwaylandwlshellsurface_p.h index 1da64e9d7..c319cd983 100644 --- a/src/client/qwaylandwlshellsurface_p.h +++ b/src/client/qwaylandwlshellsurface_p.h @@ -56,7 +56,7 @@ #include <wayland-client.h> #include <QtWaylandClient/private/qwayland-wayland.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include "qwaylandshellsurface_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandxdgshell_p.h b/src/client/qwaylandxdgshell_p.h index 2b5a8eb8b..bce8345d0 100644 --- a/src/client/qwaylandxdgshell_p.h +++ b/src/client/qwaylandxdgshell_p.h @@ -56,7 +56,7 @@ #include <wayland-client.h> #include <QtWaylandClient/private/qwayland-xdg-shell.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include "qwaylandshellsurface_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandxdgsurface_p.h b/src/client/qwaylandxdgsurface_p.h index 9d6c8c410..342dff75d 100644 --- a/src/client/qwaylandxdgsurface_p.h +++ b/src/client/qwaylandxdgsurface_p.h @@ -57,7 +57,7 @@ #include <wayland-client.h> #include <QtWaylandClient/private/qwayland-xdg-shell.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include "qwaylandshellsurface_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/shellintegration/qwaylandshellintegration_p.h b/src/client/shellintegration/qwaylandshellintegration_p.h index 8395c868e..e8e46ecaa 100644 --- a/src/client/shellintegration/qwaylandshellintegration_p.h +++ b/src/client/shellintegration/qwaylandshellintegration_p.h @@ -52,7 +52,7 @@ // #include <QtCore/qglobal.h> -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> QT_BEGIN_NAMESPACE diff --git a/src/client/shellintegration/qwaylandshellintegrationfactory_p.h b/src/client/shellintegration/qwaylandshellintegrationfactory_p.h index 6e595b06d..0783465a8 100644 --- a/src/client/shellintegration/qwaylandshellintegrationfactory_p.h +++ b/src/client/shellintegration/qwaylandshellintegrationfactory_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/client/shellintegration/qwaylandshellintegrationplugin_p.h b/src/client/shellintegration/qwaylandshellintegrationplugin_p.h index 5566843b1..be511bfc3 100644 --- a/src/client/shellintegration/qwaylandshellintegrationplugin_p.h +++ b/src/client/shellintegration/qwaylandshellintegrationplugin_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/private/qwaylandclientexport_p.h> +#include <QtWaylandClient/qwaylandclientexport.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> |