diff options
Diffstat (limited to 'src/client/hardwareintegration')
15 files changed, 27 insertions, 25 deletions
diff --git a/src/client/hardwareintegration/hardwareintegration.pri b/src/client/hardwareintegration/hardwareintegration.pri index 1588ca977..bb4fe76d6 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 c04ee1772..2c4d8ff1b 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 608a8cb22..153b3f591 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 c87c016f5..e168f612f 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 12b2e8dbb..4a1c41286 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 58bb26d19..afc105106 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 685844061..476e31a78 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 67c951eac..a7269ce9e 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 faa578567..84aa18ace 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 9b4174d31..ee64624ad 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 fcb92aecd..7241aec1f 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 e36de7e72..bd7661c2f 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 5e48e7b51..48e5e13d9 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 2bb3eb216..8fc31a883 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 c3605dc70..39d9a8ba6 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> |