diff options
84 files changed, 236 insertions, 234 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index 152370c0..01d704a9 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -67,32 +67,32 @@ SOURCES += qwaylandintegration.cpp \ qwaylandinputcontext.cpp \ qwaylanddatadevice.cpp \ -HEADERS += qwaylandintegration.h \ - qwaylandnativeinterface.h \ - qwaylandcursor.h \ - qwaylanddisplay.h \ - qwaylandwindow.h \ - qwaylandscreen.h \ - qwaylandshmbackingstore.h \ - qwaylandinputdevice.h \ - qwaylandbuffer.h \ - qwaylandshmwindow.h \ - qwaylandclipboard.h \ - qwaylanddnd.h \ - qwaylanddataoffer.h \ - qwaylanddatadevicemanager.h \ - qwaylanddatasource.h \ - qwaylandshellsurface.h \ - qwaylandextendedoutput.h \ - qwaylandextendedsurface.h \ - qwaylandsubsurface.h \ - qwaylandtouch.h \ - qwaylandqtkey.h \ +HEADERS += qwaylandintegration_p.h \ + qwaylandnativeinterface_p.h \ + qwaylandcursor_p.h \ + qwaylanddisplay_p.h \ + qwaylandwindow_p.h \ + qwaylandscreen_p.h \ + qwaylandshmbackingstore_p.h \ + qwaylandinputdevice_p.h \ + qwaylandbuffer_p.h \ + qwaylandshmwindow_p.h \ + qwaylandclipboard_p.h \ + qwaylanddnd_p.h \ + qwaylanddataoffer_p.h \ + qwaylanddatadevicemanager_p.h \ + qwaylanddatasource_p.h \ + qwaylandshellsurface_p.h \ + qwaylandextendedoutput_p.h \ + qwaylandextendedsurface_p.h \ + qwaylandsubsurface_p.h \ + qwaylandtouch_p.h \ + qwaylandqtkey_p.h \ ../shared/qwaylandmimehelper.h \ - qwaylanddecoration.h \ - qwaylandeventthread.h \ - qwaylandwindowmanagerintegration.h \ - qwaylandinputcontext.h \ - qwaylanddatadevice.h \ + qwaylanddecoration_p.h \ + qwaylandeventthread_p.h \ + qwaylandwindowmanagerintegration_p.h \ + qwaylandinputcontext_p.h \ + qwaylanddatadevice_p.h \ include(hardwareintegration/hardwareintegration.pri) diff --git a/src/client/hardwareintegration/hardwareintegration.pri b/src/client/hardwareintegration/hardwareintegration.pri index 1588ca97..bb4fe76d 100644 --- a/src/client/hardwareintegration/hardwareintegration.pri +++ b/src/client/hardwareintegration/hardwareintegration.pri @@ -2,6 +2,8 @@ WAYLANDCLIENTSOURCES += \ $$PWD/../../extensions/server-buffer-extension.xml \ $$PWD/../../extensions/hardware-integration.xml +INCLUDEPATH += $$PWD + SOURCES += \ $$PWD/qwaylandclientbufferintegration.cpp \ $$PWD/qwaylandclientbufferintegrationplugin.cpp \ @@ -12,11 +14,11 @@ SOURCES += \ $$PWD/qwaylandhardwareintegration.cpp HEADERS += \ - $$PWD/qwaylandclientbufferintegration.h \ - $$PWD/qwaylandclientbufferintegrationplugin.h \ - $$PWD/qwaylandclientbufferintegrationfactory.h \ - $$PWD/qwaylandserverbufferintegration.h \ - $$PWD/qwaylandserverbufferintegrationplugin.h \ - $$PWD/qwaylandserverbufferintegrationfactory.h \ - $$PWD/qwaylandhardwareintegration.h + $$PWD/qwaylandclientbufferintegration_p.h \ + $$PWD/qwaylandclientbufferintegrationplugin_p.h \ + $$PWD/qwaylandclientbufferintegrationfactory_p.h \ + $$PWD/qwaylandserverbufferintegration_p.h \ + $$PWD/qwaylandserverbufferintegrationplugin_p.h \ + $$PWD/qwaylandserverbufferintegrationfactory_p.h \ + $$PWD/qwaylandhardwareintegration_p.h diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegration.cpp b/src/client/hardwareintegration/qwaylandclientbufferintegration.cpp index c04ee177..2c4d8ff1 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegration.cpp +++ b/src/client/hardwareintegration/qwaylandclientbufferintegration.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qwaylandclientbufferintegration.h" +#include "qwaylandclientbufferintegration_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegration.h b/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h index 608a8cb2..153b3f59 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegration.h +++ b/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h @@ -43,7 +43,7 @@ #define QWAYLANDCLIENTBUFFERINTEGRATION_H #include <QtCore/qglobal.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp index c87c016f..e168f612 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp +++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qwaylandclientbufferintegrationfactory.h" -#include "qwaylandclientbufferintegrationplugin.h" -#include "qwaylandclientbufferintegration.h" +#include "qwaylandclientbufferintegrationfactory_p.h" +#include "qwaylandclientbufferintegrationplugin_p.h" +#include "qwaylandclientbufferintegration_p.h" #include <QtCore/private/qfactoryloader_p.h> #include <QtCore/QCoreApplication> #include <QtCore/QDir> diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.h b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h index 12b2e8db..4a1c4128 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.h +++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H #define QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp index 58bb26d1..afc10510 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp +++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qwaylandclientbufferintegrationplugin.h" +#include "qwaylandclientbufferintegrationplugin_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin.h b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h index 68584406..476e31a7 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin.h +++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H #define QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/client/hardwareintegration/qwaylandhardwareintegration.cpp b/src/client/hardwareintegration/qwaylandhardwareintegration.cpp index 67c951ea..a7269ce9 100644 --- a/src/client/hardwareintegration/qwaylandhardwareintegration.cpp +++ b/src/client/hardwareintegration/qwaylandhardwareintegration.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qwaylandhardwareintegration.h" +#include "qwaylandhardwareintegration_p.h" -#include "qwaylanddisplay.h" +#include "qwaylanddisplay_p.h" QT_BEGIN_NAMESPACE QWaylandHardwareIntegration::QWaylandHardwareIntegration(struct ::wl_registry *registry, int id) diff --git a/src/client/hardwareintegration/qwaylandhardwareintegration.h b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h index faa57856..84aa18ac 100644 --- a/src/client/hardwareintegration/qwaylandhardwareintegration.h +++ b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h @@ -43,7 +43,7 @@ #define QWAYLANDHARDWAREINTEGRATION_H #include <QtWaylandClient/private/qwayland-hardware-integration.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp b/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp index 9b4174d3..ee64624a 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp +++ b/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp @@ -1,4 +1,4 @@ -#include "qwaylandserverbufferintegration.h" +#include "qwaylandserverbufferintegration_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegration.h b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h index fcb92aec..7241aec1 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegration.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h @@ -45,7 +45,7 @@ #include <QtGui/qopengl.h> #include <QtWaylandClient/private/qwayland-server-buffer-extension.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp index e36de7e7..bd7661c2 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp +++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qwaylandserverbufferintegrationfactory.h" -#include "qwaylandserverbufferintegrationplugin.h" +#include "qwaylandserverbufferintegrationfactory_p.h" +#include "qwaylandserverbufferintegrationplugin_p.h" #include <QtCore/private/qfactoryloader_p.h> #include <QtCore/QCoreApplication> diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.h b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h index 5e48e7b5..48e5e13d 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDSERVERBUFFERINTEGRATIONFACTORY_H #define QWAYLANDSERVERBUFFERINTEGRATIONFACTORY_H -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp index 2bb3eb21..8fc31a88 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp +++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qwaylandserverbufferintegrationplugin.h" +#include "qwaylandserverbufferintegrationplugin_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin.h b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h index c3605dc7..39d9a8ba 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H #define QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/client/qwaylandbuffer.h b/src/client/qwaylandbuffer_p.h index 9548eadf..2bb9990f 100644 --- a/src/client/qwaylandbuffer.h +++ b/src/client/qwaylandbuffer_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDBUFFER_H #define QWAYLANDBUFFER_H -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtCore/QSize> #include <QtCore/QRect> diff --git a/src/client/qwaylandclientexport.h b/src/client/qwaylandclientexport_p.h index d9d6d7f7..d9d6d7f7 100644 --- a/src/client/qwaylandclientexport.h +++ b/src/client/qwaylandclientexport_p.h diff --git a/src/client/qwaylandclipboard.cpp b/src/client/qwaylandclipboard.cpp index 838f6d23..c40f023b 100644 --- a/src/client/qwaylandclipboard.cpp +++ b/src/client/qwaylandclipboard.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qwaylandclipboard.h" -#include "qwaylanddisplay.h" -#include "qwaylandinputdevice.h" -#include "qwaylanddataoffer.h" -#include "qwaylanddatasource.h" -#include "qwaylanddatadevice.h" +#include "qwaylandclipboard_p.h" +#include "qwaylanddisplay_p.h" +#include "qwaylandinputdevice_p.h" +#include "qwaylanddataoffer_p.h" +#include "qwaylanddatasource_p.h" +#include "qwaylanddatadevice_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandclipboard.h b/src/client/qwaylandclipboard_p.h index 692a3125..0dea3371 100644 --- a/src/client/qwaylandclipboard.h +++ b/src/client/qwaylandclipboard_p.h @@ -45,7 +45,7 @@ #include <qpa/qplatformclipboard.h> #include <QtCore/QVariant> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandcursor.cpp b/src/client/qwaylandcursor.cpp index 05ab6d49..90789b0d 100644 --- a/src/client/qwaylandcursor.cpp +++ b/src/client/qwaylandcursor.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qwaylandcursor.h" +#include "qwaylandcursor_p.h" -#include "qwaylanddisplay.h" -#include "qwaylandinputdevice.h" -#include "qwaylandscreen.h" -#include "qwaylandshmbackingstore.h" +#include "qwaylanddisplay_p.h" +#include "qwaylandinputdevice_p.h" +#include "qwaylandscreen_p.h" +#include "qwaylandshmbackingstore_p.h" #include <QtGui/QImageReader> #include <QDebug> diff --git a/src/client/qwaylandcursor.h b/src/client/qwaylandcursor_p.h index 894d322a..282ac685 100644 --- a/src/client/qwaylandcursor.h +++ b/src/client/qwaylandcursor_p.h @@ -44,7 +44,7 @@ #include <qpa/qplatformcursor.h> #include <QtCore/QMap> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> struct wl_cursor; struct wl_cursor_image; diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp index faa04c3d..2d6a6f4b 100644 --- a/src/client/qwaylanddatadevice.cpp +++ b/src/client/qwaylanddatadevice.cpp @@ -38,13 +38,13 @@ ** ****************************************************************************/ -#include "qwaylanddatadevice.h" +#include "qwaylanddatadevice_p.h" -#include "qwaylanddatadevicemanager.h" -#include "qwaylanddataoffer.h" -#include "qwaylanddatasource.h" -#include "qwaylanddnd.h" -#include "qwaylandinputdevice.h" +#include "qwaylanddatadevicemanager_p.h" +#include "qwaylanddataoffer_p.h" +#include "qwaylanddatasource_p.h" +#include "qwaylanddnd_p.h" +#include "qwaylandinputdevice_p.h" #include <QtCore/QMimeData> #include <QtGui/QGuiApplication> diff --git a/src/client/qwaylanddatadevice.h b/src/client/qwaylanddatadevice_p.h index e258d877..4e98424e 100644 --- a/src/client/qwaylanddatadevice.h +++ b/src/client/qwaylanddatadevice_p.h @@ -41,7 +41,7 @@ #ifndef QWAYLANDDATADEVICE_H #define QWAYLANDDATADEVICE_H -#include "qwaylanddisplay.h" +#include "qwaylanddisplay_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylanddatadevicemanager.cpp b/src/client/qwaylanddatadevicemanager.cpp index 4a96dbce..5de28c00 100644 --- a/src/client/qwaylanddatadevicemanager.cpp +++ b/src/client/qwaylanddatadevicemanager.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qwaylanddatadevicemanager.h" +#include "qwaylanddatadevicemanager_p.h" -#include "qwaylandinputdevice.h" -#include "qwaylanddatadevice.h" -#include "qwaylanddataoffer.h" +#include "qwaylandinputdevice_p.h" +#include "qwaylanddatadevice_p.h" +#include "qwaylanddataoffer_p.h" #include <QtCore/QDebug> diff --git a/src/client/qwaylanddatadevicemanager.h b/src/client/qwaylanddatadevicemanager_p.h index c51e12e7..6e2beafb 100644 --- a/src/client/qwaylanddatadevicemanager.h +++ b/src/client/qwaylanddatadevicemanager_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDDATADEVICEMANAGER_H #define QWAYLANDDATADEVICEMANAGER_H -#include <QtWaylandClient/qwaylanddisplay.h> +#include <QtWaylandClient/private/qwaylanddisplay_p.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylanddataoffer.cpp b/src/client/qwaylanddataoffer.cpp index e237d0b9..adaeb521 100644 --- a/src/client/qwaylanddataoffer.cpp +++ b/src/client/qwaylanddataoffer.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qwaylanddataoffer.h" -#include "qwaylanddatadevicemanager.h" +#include "qwaylanddataoffer_p.h" +#include "qwaylanddatadevicemanager_p.h" #include <QtCore/private/qcore_unix_p.h> #include <QtGui/private/qguiapplication_p.h> diff --git a/src/client/qwaylanddataoffer.h b/src/client/qwaylanddataoffer_p.h index 7dc3baa3..ab34e177 100644 --- a/src/client/qwaylanddataoffer.h +++ b/src/client/qwaylanddataoffer_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDDATAOFFER_H #define QWAYLANDDATAOFFER_H -#include "qwaylanddisplay.h" +#include "qwaylanddisplay_p.h" #include <QtGui/private/qdnd_p.h> diff --git a/src/client/qwaylanddatasource.cpp b/src/client/qwaylanddatasource.cpp index ba4b6811..3376db56 100644 --- a/src/client/qwaylanddatasource.cpp +++ b/src/client/qwaylanddatasource.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qwaylanddatasource.h" -#include "qwaylanddataoffer.h" -#include "qwaylanddatadevicemanager.h" -#include "qwaylandinputdevice.h" +#include "qwaylanddatasource_p.h" +#include "qwaylanddataoffer_p.h" +#include "qwaylanddatadevicemanager_p.h" +#include "qwaylandinputdevice_p.h" #include "qwaylandmimehelper.h" #include <QtCore/QFile> diff --git a/src/client/qwaylanddatasource.h b/src/client/qwaylanddatasource_p.h index 63a2150f..9568f507 100644 --- a/src/client/qwaylanddatasource.h +++ b/src/client/qwaylanddatasource_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDDATASOURCE_H #define QWAYLANDDATASOURCE_H -#include <QtWaylandClient/qwaylanddatadevicemanager.h> +#include <QtWaylandClient/private/qwaylanddatadevicemanager_p.h> #include <QtWaylandClient/private/wayland-wayland-client-protocol.h> diff --git a/src/client/qwaylanddecoration.cpp b/src/client/qwaylanddecoration.cpp index 74c01f93..8e7d0314 100644 --- a/src/client/qwaylanddecoration.cpp +++ b/src/client/qwaylanddecoration.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qwaylanddecoration.h" +#include "qwaylanddecoration_p.h" -#include "qwaylandwindow.h" -#include "qwaylandshellsurface.h" -#include "qwaylandinputdevice.h" -#include "qwaylandscreen.h" +#include "qwaylandwindow_p.h" +#include "qwaylandshellsurface_p.h" +#include "qwaylandinputdevice_p.h" +#include "qwaylandscreen_p.h" #include <QtGui/QGuiApplication> #include <QtGui/QImage> diff --git a/src/client/qwaylanddecoration.h b/src/client/qwaylanddecoration_p.h index f9972358..3f53721f 100644 --- a/src/client/qwaylanddecoration.h +++ b/src/client/qwaylanddecoration_p.h @@ -49,7 +49,7 @@ #include <QtGui/QColor> #include <QtGui/QStaticText> #include <QtGui/QImage> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <wayland-client.h> diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 922c4bcb..ec439b5d 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -39,26 +39,26 @@ ** ****************************************************************************/ -#include "qwaylanddisplay.h" - -#include "qwaylandeventthread.h" -#include "qwaylandintegration.h" -#include "qwaylandwindow.h" -#include "qwaylandscreen.h" -#include "qwaylandcursor.h" -#include "qwaylandinputdevice.h" -#include "qwaylandclipboard.h" -#include "qwaylanddatadevicemanager.h" -#include "qwaylandhardwareintegration.h" - - -#include "qwaylandwindowmanagerintegration.h" - -#include "qwaylandextendedoutput.h" -#include "qwaylandextendedsurface.h" -#include "qwaylandsubsurface.h" -#include "qwaylandtouch.h" -#include "qwaylandqtkey.h" +#include "qwaylanddisplay_p.h" + +#include "qwaylandeventthread_p.h" +#include "qwaylandintegration_p.h" +#include "qwaylandwindow_p.h" +#include "qwaylandscreen_p.h" +#include "qwaylandcursor_p.h" +#include "qwaylandinputdevice_p.h" +#include "qwaylandclipboard_p.h" +#include "qwaylanddatadevicemanager_p.h" +#include "qwaylandhardwareintegration_p.h" + + +#include "qwaylandwindowmanagerintegration_p.h" + +#include "qwaylandextendedoutput_p.h" +#include "qwaylandextendedsurface_p.h" +#include "qwaylandsubsurface_p.h" +#include "qwaylandtouch_p.h" +#include "qwaylandqtkey_p.h" #include <QtWaylandClient/private/qwayland-text.h> diff --git a/src/client/qwaylanddisplay.h b/src/client/qwaylanddisplay_p.h index 4f9dacf4..5ba4f51b 100644 --- a/src/client/qwaylanddisplay.h +++ b/src/client/qwaylanddisplay_p.h @@ -50,7 +50,7 @@ #include <wayland-client.h> #include <QtWaylandClient/private/qwayland-wayland.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> struct wl_cursor_image; diff --git a/src/client/qwaylanddnd.cpp b/src/client/qwaylanddnd.cpp index 635fd967..0d5eddf5 100644 --- a/src/client/qwaylanddnd.cpp +++ b/src/client/qwaylanddnd.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qwaylanddnd.h" +#include "qwaylanddnd_p.h" -#include "qwaylanddatadevice.h" -#include "qwaylanddatadevicemanager.h" -#include "qwaylanddataoffer.h" -#include "qwaylandinputdevice.h" +#include "qwaylanddatadevice_p.h" +#include "qwaylanddatadevicemanager_p.h" +#include "qwaylanddataoffer_p.h" +#include "qwaylandinputdevice_p.h" #include <QtGui/private/qshapedpixmapdndwindow_p.h> diff --git a/src/client/qwaylanddnd.h b/src/client/qwaylanddnd_p.h index 8879a1d4..22b00471 100644 --- a/src/client/qwaylanddnd.h +++ b/src/client/qwaylanddnd_p.h @@ -47,7 +47,7 @@ #include <QtGui/QDrag> #include <QtCore/QMimeData> -#include <QtWaylandClient/qwaylanddisplay.h> +#include <QtWaylandClient/private/qwaylanddisplay_p.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandeventthread.cpp b/src/client/qwaylandeventthread.cpp index 3392d36c..b94110c2 100644 --- a/src/client/qwaylandeventthread.cpp +++ b/src/client/qwaylandeventthread.cpp @@ -1,4 +1,4 @@ -#include "qwaylandeventthread.h" +#include "qwaylandeventthread_p.h" #include <QtCore/QSocketNotifier> #include <QCoreApplication> diff --git a/src/client/qwaylandeventthread.h b/src/client/qwaylandeventthread_p.h index ba7e33e0..4174c96c 100644 --- a/src/client/qwaylandeventthread.h +++ b/src/client/qwaylandeventthread_p.h @@ -5,7 +5,7 @@ #include <QMutex> #include <wayland-client.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandextendedoutput.cpp b/src/client/qwaylandextendedoutput.cpp index d7c684be..c79685af 100644 --- a/src/client/qwaylandextendedoutput.cpp +++ b/src/client/qwaylandextendedoutput.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qwaylandextendedoutput.h" +#include "qwaylandextendedoutput_p.h" -#include "qwaylandscreen.h" +#include "qwaylandscreen_p.h" #include <qpa/qwindowsysteminterface.h> diff --git a/src/client/qwaylandextendedoutput.h b/src/client/qwaylandextendedoutput_p.h index d1ef3397..f18fb8e5 100644 --- a/src/client/qwaylandextendedoutput.h +++ b/src/client/qwaylandextendedoutput_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDEXTENDEDOUTPUT_H #define QWAYLANDEXTENDEDOUTPUT_H -#include <QtWaylandClient/qwaylanddisplay.h> +#include <QtWaylandClient/private/qwaylanddisplay_p.h> #include <QtWaylandClient/private/qwayland-output-extension.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandextendedsurface.cpp b/src/client/qwaylandextendedsurface.cpp index bfd2a1d0..9d5a4970 100644 --- a/src/client/qwaylandextendedsurface.cpp +++ b/src/client/qwaylandextendedsurface.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "qwaylandextendedsurface.h" +#include "qwaylandextendedsurface_p.h" -#include "qwaylandwindow.h" +#include "qwaylandwindow_p.h" #include "wayland-client.h" -#include "qwaylanddisplay.h" +#include "qwaylanddisplay_p.h" -#include "qwaylandnativeinterface.h" +#include "qwaylandnativeinterface_p.h" #include <QtGui/QGuiApplication> #include <qpa/qplatformnativeinterface.h> diff --git a/src/client/qwaylandextendedsurface.h b/src/client/qwaylandextendedsurface_p.h index 8c054647..00b961d3 100644 --- a/src/client/qwaylandextendedsurface.h +++ b/src/client/qwaylandextendedsurface_p.h @@ -45,7 +45,7 @@ #include <QtCore/QString> #include <QtCore/QVariant> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <wayland-client.h> #include <QtWaylandClient/private/qwayland-surface-extension.h> diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp index e9fb8717..8a711955 100644 --- a/src/client/qwaylandinputcontext.cpp +++ b/src/client/qwaylandinputcontext.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include "qwaylandinputcontext.h" +#include "qwaylandinputcontext_p.h" #include <QGuiApplication> #include <QWindow> @@ -46,9 +46,9 @@ #include <xkbcommon/xkbcommon.h> #endif -#include "qwaylanddisplay.h" -#include "qwaylandinputdevice.h" -#include "qwaylandwindow.h" +#include "qwaylanddisplay_p.h" +#include "qwaylandinputdevice_p.h" +#include "qwaylandwindow_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandinputcontext.h b/src/client/qwaylandinputcontext_p.h index 1f7e4e36..1f7e4e36 100644 --- a/src/client/qwaylandinputcontext.h +++ b/src/client/qwaylandinputcontext_p.h diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp index b9338b4c..81bb0703 100644 --- a/src/client/qwaylandinputdevice.cpp +++ b/src/client/qwaylandinputdevice.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "qwaylandinputdevice.h" - -#include "qwaylandintegration.h" -#include "qwaylandwindow.h" -#include "qwaylandbuffer.h" -#include "qwaylanddatadevice.h" -#include "qwaylanddatadevicemanager.h" -#include "qwaylandtouch.h" -#include "qwaylandscreen.h" -#include "qwaylandcursor.h" +#include "qwaylandinputdevice_p.h" + +#include "qwaylandintegration_p.h" +#include "qwaylandwindow_p.h" +#include "qwaylandbuffer_p.h" +#include "qwaylanddatadevice_p.h" +#include "qwaylanddatadevicemanager_p.h" +#include "qwaylandtouch_p.h" +#include "qwaylandscreen_p.h" +#include "qwaylandcursor_p.h" #include <QtGui/private/qpixmap_raster_p.h> #include <qpa/qplatformwindow.h> diff --git a/src/client/qwaylandinputdevice.h b/src/client/qwaylandinputdevice_p.h index 641c8b84..9e955f5d 100644 --- a/src/client/qwaylandinputdevice.h +++ b/src/client/qwaylandinputdevice_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDINPUTDEVICE_H #define QWAYLANDINPUTDEVICE_H -#include <QtWaylandClient/qwaylandwindow.h> +#include <QtWaylandClient/private/qwaylandwindow_p.h> #include <QSocketNotifier> #include <QObject> diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 9acda210..2e36a16d 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "qwaylandintegration.h" +#include "qwaylandintegration_p.h" -#include "qwaylanddisplay.h" -#include "qwaylandinputcontext.h" -#include "qwaylandshmbackingstore.h" -#include "qwaylandshmwindow.h" -#include "qwaylandnativeinterface.h" -#include "qwaylandclipboard.h" -#include "qwaylanddnd.h" -#include "qwaylandwindowmanagerintegration.h" +#include "qwaylanddisplay_p.h" +#include "qwaylandinputcontext_p.h" +#include "qwaylandshmbackingstore_p.h" +#include "qwaylandshmwindow_p.h" +#include "qwaylandnativeinterface_p.h" +#include "qwaylandclipboard_p.h" +#include "qwaylanddnd_p.h" +#include "qwaylandwindowmanagerintegration_p.h" #include "QtPlatformSupport/private/qgenericunixfontdatabase_p.h" #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> @@ -65,12 +65,12 @@ #include <qpa/qplatformaccessibility.h> #include <qpa/qplatforminputcontext.h> -#include "qwaylandhardwareintegration.h" -#include "qwaylandclientbufferintegration.h" -#include "qwaylandclientbufferintegrationfactory.h" +#include "qwaylandhardwareintegration_p.h" +#include "qwaylandclientbufferintegration_p.h" +#include "qwaylandclientbufferintegrationfactory_p.h" -#include "qwaylandserverbufferintegration.h" -#include "qwaylandserverbufferintegrationfactory.h" +#include "qwaylandserverbufferintegration_p.h" +#include "qwaylandserverbufferintegrationfactory_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandintegration.h b/src/client/qwaylandintegration_p.h index bc51c23b..7c062c0e 100644 --- a/src/client/qwaylandintegration.h +++ b/src/client/qwaylandintegration_p.h @@ -44,7 +44,7 @@ #include <qpa/qplatformintegration.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> QT_BEGIN_NAMESPACE class QWaylandBuffer; diff --git a/src/client/qwaylandnativeinterface.cpp b/src/client/qwaylandnativeinterface.cpp index 291f1711..f8d95bb2 100644 --- a/src/client/qwaylandnativeinterface.cpp +++ b/src/client/qwaylandnativeinterface.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "qwaylandnativeinterface.h" -#include "qwaylanddisplay.h" -#include "qwaylandwindow.h" -#include "qwaylandextendedsurface.h" -#include "qwaylandintegration.h" -#include "qwaylanddisplay.h" -#include "qwaylandwindowmanagerintegration.h" +#include "qwaylandnativeinterface_p.h" +#include "qwaylanddisplay_p.h" +#include "qwaylandwindow_p.h" +#include "qwaylandextendedsurface_p.h" +#include "qwaylandintegration_p.h" +#include "qwaylanddisplay_p.h" +#include "qwaylandwindowmanagerintegration_p.h" #include <QtGui/private/qguiapplication_p.h> #include <QtGui/QScreen> diff --git a/src/client/qwaylandnativeinterface.h b/src/client/qwaylandnativeinterface_p.h index bc080769..b9ee2d0e 100644 --- a/src/client/qwaylandnativeinterface.h +++ b/src/client/qwaylandnativeinterface_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDNATIVEINTERFACE_H #define QWAYLANDNATIVEINTERFACE_H -#include <QtWaylandClient/qwaylandscreen.h> +#include <QtWaylandClient/private/qwaylandscreen_p.h> #include <QVariantMap> #include <qpa/qplatformnativeinterface.h> diff --git a/src/client/qwaylandqtkey.cpp b/src/client/qwaylandqtkey.cpp index 6cc4597d..a6b99cb4 100644 --- a/src/client/qwaylandqtkey.cpp +++ b/src/client/qwaylandqtkey.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qwaylandqtkey.h" -#include "qwaylandinputdevice.h" +#include "qwaylandqtkey_p.h" +#include "qwaylandinputdevice_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandqtkey.h b/src/client/qwaylandqtkey_p.h index 49563b78..a9c4e99f 100644 --- a/src/client/qwaylandqtkey.h +++ b/src/client/qwaylandqtkey_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDQTKEY_H #define QWAYLANDQTKEY_H -#include <QtWaylandClient/qwaylanddisplay.h> +#include <QtWaylandClient/private/qwaylanddisplay_p.h> #include <qpa/qwindowsysteminterface.h> #include <QtWaylandClient/private/qwayland-qtkey-extension.h> diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp index cda94a7e..416b320a 100644 --- a/src/client/qwaylandscreen.cpp +++ b/src/client/qwaylandscreen.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qwaylandscreen.h" +#include "qwaylandscreen_p.h" -#include "qwaylanddisplay.h" -#include "qwaylandcursor.h" -#include "qwaylandextendedoutput.h" +#include "qwaylanddisplay_p.h" +#include "qwaylandcursor_p.h" +#include "qwaylandextendedoutput_p.h" #include <qpa/qwindowsysteminterface.h> diff --git a/src/client/qwaylandscreen.h b/src/client/qwaylandscreen_p.h index 15ae5189..42408acf 100644 --- a/src/client/qwaylandscreen.h +++ b/src/client/qwaylandscreen_p.h @@ -43,7 +43,7 @@ #define QWAYLANDSCREEN_H #include <qpa/qplatformscreen.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/private/qwayland-wayland.h> diff --git a/src/client/qwaylandshellsurface.cpp b/src/client/qwaylandshellsurface.cpp index 4c8ff1bc..b7a819fd 100644 --- a/src/client/qwaylandshellsurface.cpp +++ b/src/client/qwaylandshellsurface.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "qwaylandshellsurface.h" +#include "qwaylandshellsurface_p.h" -#include "qwaylanddisplay.h" -#include "qwaylandwindow.h" -#include "qwaylandinputdevice.h" -#include "qwaylanddecoration.h" -#include "qwaylandscreen.h" +#include "qwaylanddisplay_p.h" +#include "qwaylandwindow_p.h" +#include "qwaylandinputdevice_p.h" +#include "qwaylanddecoration_p.h" +#include "qwaylandscreen_p.h" #include <QtCore/QDebug> diff --git a/src/client/qwaylandshellsurface.h b/src/client/qwaylandshellsurface_p.h index 25f70333..2477c3f0 100644 --- a/src/client/qwaylandshellsurface.h +++ b/src/client/qwaylandshellsurface_p.h @@ -47,7 +47,7 @@ #include <wayland-client.h> #include <QtWaylandClient/private/qwayland-wayland.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandshmbackingstore.cpp b/src/client/qwaylandshmbackingstore.cpp index 00a4b13a..41f7da20 100644 --- a/src/client/qwaylandshmbackingstore.cpp +++ b/src/client/qwaylandshmbackingstore.cpp @@ -38,14 +38,14 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qwaylandshmbackingstore.h" +#include "qwaylandshmbackingstore_p.h" #include <QtCore/qdebug.h> -#include "qwaylanddisplay.h" -#include "qwaylandshmwindow.h" -#include "qwaylandscreen.h" -#include "qwaylanddecoration.h" +#include "qwaylanddisplay_p.h" +#include "qwaylandshmwindow_p.h" +#include "qwaylandscreen_p.h" +#include "qwaylanddecoration_p.h" #include <QtGui/QPainter> diff --git a/src/client/qwaylandshmbackingstore.h b/src/client/qwaylandshmbackingstore_p.h index b5ee3a38..1affafab 100644 --- a/src/client/qwaylandshmbackingstore.h +++ b/src/client/qwaylandshmbackingstore_p.h @@ -42,10 +42,10 @@ #ifndef QWAYLANDSHMBACKINGSTORE_H #define QWAYLANDSHMBACKINGSTORE_H -#include <QtWaylandClient/qwaylandbuffer.h> +#include <QtWaylandClient/private/qwaylandbuffer_p.h> -#include <QtWaylandClient/qwaylanddecoration.h> -#include <QtWaylandClient/qwaylandshmwindow.h> +#include <QtWaylandClient/private/qwaylanddecoration_p.h> +#include <QtWaylandClient/private/qwaylandshmwindow_p.h> #include <qpa/qplatformbackingstore.h> #include <QtGui/QImage> diff --git a/src/client/qwaylandshmwindow.cpp b/src/client/qwaylandshmwindow.cpp index 48a1bfd5..de87682c 100644 --- a/src/client/qwaylandshmwindow.cpp +++ b/src/client/qwaylandshmwindow.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qwaylandshmwindow.h" +#include "qwaylandshmwindow_p.h" -#include "qwaylandbuffer.h" +#include "qwaylandbuffer_p.h" #include <QtCore/QVector> diff --git a/src/client/qwaylandshmwindow.h b/src/client/qwaylandshmwindow_p.h index f915c545..83479f31 100644 --- a/src/client/qwaylandshmwindow.h +++ b/src/client/qwaylandshmwindow_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDSHMWINDOW_H #define QWAYLANDSHMWINDOW_H -#include <QtWaylandClient/qwaylandwindow.h> +#include <QtWaylandClient/private/qwaylandwindow_p.h> #include <QtGui/QRegion> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandsubsurface.cpp b/src/client/qwaylandsubsurface.cpp index 0e9d575a..6db59fa2 100644 --- a/src/client/qwaylandsubsurface.cpp +++ b/src/client/qwaylandsubsurface.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qwaylandsubsurface.h" +#include "qwaylandsubsurface_p.h" -#include "qwaylandwindow.h" +#include "qwaylandwindow_p.h" #include <QtCore/QDebug> diff --git a/src/client/qwaylandsubsurface.h b/src/client/qwaylandsubsurface_p.h index 97158b6a..bd0da96d 100644 --- a/src/client/qwaylandsubsurface.h +++ b/src/client/qwaylandsubsurface_p.h @@ -46,7 +46,7 @@ #include <QtCore/qglobal.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/private/qwaylandclientexport_p.h> #include <QtWaylandClient/private/qwayland-sub-surface-extension.h> diff --git a/src/client/qwaylandtouch.cpp b/src/client/qwaylandtouch.cpp index 5835d9d3..db6d4b92 100644 --- a/src/client/qwaylandtouch.cpp +++ b/src/client/qwaylandtouch.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qwaylandtouch.h" -#include "qwaylandinputdevice.h" +#include "qwaylandtouch_p.h" +#include "qwaylandinputdevice_p.h" QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandtouch.h b/src/client/qwaylandtouch_p.h index e6f57ab5..c00c7c0d 100644 --- a/src/client/qwaylandtouch.h +++ b/src/client/qwaylandtouch_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDTOUCh_H #define QWAYLANDTOUCH_H -#include <QtWaylandClient/qwaylanddisplay.h> +#include <QtWaylandClient/private/qwaylanddisplay_p.h> #include <qpa/qwindowsysteminterface.h> #include <QtWaylandClient/private/qwayland-touch-extension.h> diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index b64d3e6a..810239a7 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include "qwaylandwindow.h" - -#include "qwaylandbuffer.h" -#include "qwaylanddisplay.h" -#include "qwaylandinputdevice.h" -#include "qwaylandscreen.h" -#include "qwaylandshellsurface.h" -#include "qwaylandextendedsurface.h" -#include "qwaylandsubsurface.h" -#include "qwaylanddecoration.h" -#include "qwaylandwindowmanagerintegration.h" +#include "qwaylandwindow_p.h" + +#include "qwaylandbuffer_p.h" +#include "qwaylanddisplay_p.h" +#include "qwaylandinputdevice_p.h" +#include "qwaylandscreen_p.h" +#include "qwaylandshellsurface_p.h" +#include "qwaylandextendedsurface_p.h" +#include "qwaylandsubsurface_p.h" +#include "qwaylanddecoration_p.h" +#include "qwaylandwindowmanagerintegration_p.h" #include <QtCore/QFileInfo> #include <QtGui/QWindow> diff --git a/src/client/qwaylandwindow.h b/src/client/qwaylandwindow_p.h index 1f7344dc..6078dab7 100644 --- a/src/client/qwaylandwindow.h +++ b/src/client/qwaylandwindow_p.h @@ -48,7 +48,7 @@ #include <qpa/qplatformwindow.h> -#include <QtWaylandClient/qwaylanddisplay.h> +#include <QtWaylandClient/private/qwaylanddisplay_p.h> #include <QtWaylandClient/private/qwayland-wayland.h> diff --git a/src/client/qwaylandwindowmanagerintegration.cpp b/src/client/qwaylandwindowmanagerintegration.cpp index d396f145..9e8ce88c 100644 --- a/src/client/qwaylandwindowmanagerintegration.cpp +++ b/src/client/qwaylandwindowmanagerintegration.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qwaylandwindowmanagerintegration.h" -#include "qwaylandscreen.h" -#include "qwaylandwindow.h" +#include "qwaylandwindowmanagerintegration_p.h" +#include "qwaylandscreen_p.h" +#include "qwaylandwindow_p.h" #include <stdint.h> #include <QtCore/QEvent> diff --git a/src/client/qwaylandwindowmanagerintegration.h b/src/client/qwaylandwindowmanagerintegration_p.h index 2164f4c8..8c8f3c32 100644 --- a/src/client/qwaylandwindowmanagerintegration.h +++ b/src/client/qwaylandwindowmanagerintegration_p.h @@ -46,7 +46,7 @@ #include <QtCore/QScopedPointer> #include "wayland-client.h" -#include <QtWaylandClient/qwaylanddisplay.h> +#include <QtWaylandClient/private/qwaylanddisplay_p.h> #include <qpa/qplatformservices.h> #include <QtWaylandClient/private/qwayland-windowmanager.h> diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp index 74793dfc..7edfa2c9 100644 --- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp +++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "drmeglserverbufferintegration.h" -#include <QtWaylandClient/qwaylanddisplay.h> +#include <QtWaylandClient/private/qwaylanddisplay_p.h> #include <QDebug> #include <QtGui/QOpenGLContext> diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h index 4a039d12..c4736282 100644 --- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h @@ -44,10 +44,10 @@ #include <QtWaylandClient/private/qwayland-wayland.h> #include "qwayland-drm-egl-server-buffer.h" -#include <QtWaylandClient/qwaylandserverbufferintegration.h> +#include <QtWaylandClient/private/qwaylandserverbufferintegration_p.h> #include "drmeglserverbufferintegration.h" -#include <QtWaylandClient/qwaylanddisplay.h> +#include <QtWaylandClient/private/qwaylanddisplay_p.h> #include <QtCore/QTextStream> #include <EGL/egl.h> diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h index 6b4719b7..0c7d76cb 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDEGLINTEGRATION_H #define QWAYLANDEGLINTEGRATION_H -#include <QtWaylandClient/qwaylandclientbufferintegration.h> +#include <QtWaylandClient/private/qwaylandclientbufferintegration_p.h> #include "qwaylandeglinclude.h" diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp index 5be78b5d..1e86bd31 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp @@ -41,7 +41,7 @@ #include "qwaylandeglwindow.h" -#include "qwaylandscreen.h" +#include <QtWaylandClient/private/qwaylandscreen_p.h> #include "qwaylandglcontext.h" #include <QtPlatformSupport/private/qeglconvenience_p.h> diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h index 06ba1b0b..9f08559d 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDEGLWINDOW_H #define QWAYLANDEGLWINDOW_H -#include <QtWaylandClient/qwaylandwindow.h> +#include <QtWaylandClient/private/qwaylandwindow_p.h> #include "qwaylandeglinclude.h" #include "qwaylandeglclientbufferintegration.h" diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp index 92d79db3..3bc1ff2b 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp @@ -41,10 +41,10 @@ #include "qwaylandglcontext.h" -#include "qwaylanddisplay.h" -#include "qwaylandwindow.h" +#include <QtWaylandClient/private/qwaylanddisplay_p.h> +#include <QtWaylandClient/private/qwaylandwindow_p.h> +#include <QtWaylandClient/private/qwaylanddecoration_p.h> #include "qwaylandeglwindow.h" -#include "qwaylanddecoration.h" #include <QDebug> #include <QtPlatformSupport/private/qeglconvenience_p.h> diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h index 1da84955..38548ac8 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDGLCONTEXT_H #define QWAYLANDGLCONTEXT_H -#include <QtWaylandClient/qwaylanddisplay.h> +#include <QtWaylandClient/private/qwaylanddisplay_p.h> #include <qpa/qplatformopenglcontext.h> #include <QtGui/QOpenGLFunctions> diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h index 9f27a1f7..068a35df 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDXCOMPOSITEEGLCLIENTBUFFERINTEGRATION_H #define QWAYLANDXCOMPOSITEEGLCLIENTBUFFERINTEGRATION_H -#include <QtWaylandClient/qwaylandclientbufferintegration.h> +#include <QtWaylandClient/private/qwaylandclientbufferintegration_p.h> #include "wayland-client.h" #include <QtCore/QTextStream> diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h index 9e512ec7..6bba18a1 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h @@ -42,8 +42,8 @@ #ifndef QWAYLANDXCOMPOSITEEGLWINDOW_H #define QWAYLANDXCOMPOSITEEGLWINDOW_H -#include <QtWaylandClient/qwaylandwindow.h> -#include <QtWaylandClient/qwaylandbuffer.h> +#include <QtWaylandClient/private/qwaylandwindow_p.h> +#include <QtWaylandClient/private/qwaylandbuffer_p.h> #include "qwaylandxcompositeeglclientbufferintegration.h" #include "qwaylandxcompositeeglcontext.h" diff --git a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h index 934abb53..a2f42166 100644 --- a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h +++ b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDXCOMPOSITEBUFFER_H #define QWAYLANDXCOMPOSITEBUFFER_H -#include <QtWaylandClient/qwaylandbuffer.h> +#include <QtWaylandClient/private/qwaylandbuffer_p.h> #include <stdint.h> struct qt_xcomposite; diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp index 33f48428..460ccb7a 100644 --- a/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp +++ b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtWaylandClient/qwaylandserverbufferintegrationplugin.h> +#include <QtWaylandClient/private/qwaylandserverbufferintegrationplugin_p.h> #include "drmeglserverbufferintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/hardwareintegration/client/wayland-egl/main.cpp b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp index a6b7bbb6..44ce6019 100644 --- a/src/plugins/hardwareintegration/client/wayland-egl/main.cpp +++ b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtWaylandClient/qwaylandclientbufferintegrationplugin.h> +#include <QtWaylandClient/private/qwaylandclientbufferintegrationplugin_p.h> #include "qwaylandeglclientbufferintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp index 161657c8..7c6135cc 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtWaylandClient/qwaylandclientbufferintegrationplugin.h> +#include <QtWaylandClient/private/qwaylandclientbufferintegrationplugin_p.h> #include "qwaylandxcompositeeglclientbufferintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h index 2dbc1541..5f23f68d 100644 --- a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDEGLPLATFORMINTEGRATION_H #define QWAYLANDEGLPLATFORMINTEGRATION_H -#include <QtWaylandClient/qwaylandintegration.h> +#include <QtWaylandClient/private/qwaylandintegration_p.h> #include "qwaylandeglclientbufferintegration.h" diff --git a/src/plugins/platforms/qwayland-generic/main.cpp b/src/plugins/platforms/qwayland-generic/main.cpp index 1b4028cd..0575d0dc 100644 --- a/src/plugins/platforms/qwayland-generic/main.cpp +++ b/src/plugins/platforms/qwayland-generic/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <qpa/qplatformintegrationplugin.h> -#include <QtWaylandClient/qwaylandintegration.h> +#include <QtWaylandClient/private/qwaylandintegration_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h index 3d225a34..340ab03c 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDXCOMPOSITEEGLPLATFROMINTEGRATION_H #define QWAYLANDXCOMPOSITEEGLPLATFROMINTEGRATION_H -#include <QtWaylandClient/qwaylandintegration.h> +#include <QtWaylandClient/private/qwaylandintegration_p.h> #include "qwaylandxcompositeeglclientbufferintegration.h" |