diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2013-11-14 13:22:13 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-27 15:32:17 +0100 |
| commit | d250b714f8eb5a60bb048830e723ac76f06215b7 (patch) | |
| tree | f6a6334b5ed8d3f3425447bd995f2bbff75e312f /src/compositor | |
| parent | 333648ff98558b78ca0464f8b1d606d40234d46f (diff) | |
| download | qtwayland-d250b714f8eb5a60bb048830e723ac76f06215b7.tar.gz | |
Move wayland into a client directory not under the plugins src folder
And make wayland common files into a library, exporting all classes. Now
there is no need to do bulild hacks to make your own version of the
wayland plugin.
Change-Id: Ib4872863dfb5ab3f2bc0f4a94ae16fc1e7b63b88
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/compositor')
26 files changed, 25 insertions, 26 deletions
diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index 67f34c89..74c955dd 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -18,7 +18,6 @@ DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT INCLUDEPATH += ../shared HEADERS += ../shared/qwaylandmimehelper.h SOURCES += ../shared/qwaylandmimehelper.cpp -HEADERS += qwayland-server-wayland.h include ($$PWD/global/global.pri) include ($$PWD/wayland_wrapper/wayland_wrapper.pri) diff --git a/src/compositor/wayland_wrapper/qwldatadevice_p.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h index cb0b1721..fb4bbcdb 100644 --- a/src/compositor/wayland_wrapper/qwldatadevice_p.h +++ b/src/compositor/wayland_wrapper/qwldatadevice_p.h @@ -41,7 +41,7 @@ #ifndef WLDATADEVICE_H #define WLDATADEVICE_H -#include <qwayland-server-wayland.h> +#include <QtCompositor/private/qwayland-server-wayland.h> #include <qwlpointer_p.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h index dcb51e16..e21a9567 100644 --- a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h +++ b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h @@ -48,7 +48,7 @@ #include <QtGui/QClipboard> #include <QtCore/QMimeData> -#include <qwayland-server-wayland.h> +#include <QtCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwldataoffer_p.h b/src/compositor/wayland_wrapper/qwldataoffer_p.h index d2965857..5911819d 100644 --- a/src/compositor/wayland_wrapper/qwldataoffer_p.h +++ b/src/compositor/wayland_wrapper/qwldataoffer_p.h @@ -41,7 +41,7 @@ #ifndef WLDATAOFFER_H #define WLDATAOFFER_H -#include <qwayland-server-wayland.h> +#include <QtCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwldatasource_p.h b/src/compositor/wayland_wrapper/qwldatasource_p.h index 35eda8cf..01ac4cbd 100644 --- a/src/compositor/wayland_wrapper/qwldatasource_p.h +++ b/src/compositor/wayland_wrapper/qwldatasource_p.h @@ -41,7 +41,7 @@ #ifndef WLDATASOURCE_H #define WLDATASOURCE_H -#include <qwayland-server-wayland.h> +#include <QtCompositor/private/qwayland-server-wayland.h> #include <QtCore/QList> diff --git a/src/compositor/wayland_wrapper/qwldisplay.cpp b/src/compositor/wayland_wrapper/qwldisplay.cpp index 5dd6e382..affb0d17 100644 --- a/src/compositor/wayland_wrapper/qwldisplay.cpp +++ b/src/compositor/wayland_wrapper/qwldisplay.cpp @@ -42,7 +42,7 @@ #include <QtCore/QDebug> -#include <wayland-wayland-server-protocol.h> +#include <QtCompositor/private/wayland-wayland-server-protocol.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlextendedoutput_p.h b/src/compositor/wayland_wrapper/qwlextendedoutput_p.h index d1704b8c..f3625ed4 100644 --- a/src/compositor/wayland_wrapper/qwlextendedoutput_p.h +++ b/src/compositor/wayland_wrapper/qwlextendedoutput_p.h @@ -47,7 +47,7 @@ #include <QtCore/qnamespace.h> -#include <qwayland-server-output-extension.h> +#include <QtCompositor/private/qwayland-server-output-extension.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlextendedsurface_p.h b/src/compositor/wayland_wrapper/qwlextendedsurface_p.h index ecf2f49d..3b572108 100644 --- a/src/compositor/wayland_wrapper/qwlextendedsurface_p.h +++ b/src/compositor/wayland_wrapper/qwlextendedsurface_p.h @@ -43,7 +43,7 @@ #include <wayland-server.h> -#include "qwayland-server-surface-extension.h" +#include <QtCompositor/private/qwayland-server-surface-extension.h> #include <private/qwlsurface_p.h> #include <QtCompositor/qwaylandsurface.h> diff --git a/src/compositor/wayland_wrapper/qwlinputdevice_p.h b/src/compositor/wayland_wrapper/qwlinputdevice_p.h index 8c5b411a..01f68c3f 100644 --- a/src/compositor/wayland_wrapper/qwlinputdevice_p.h +++ b/src/compositor/wayland_wrapper/qwlinputdevice_p.h @@ -53,7 +53,7 @@ #include <xkbcommon/xkbcommon.h> #endif -#include <qwayland-server-wayland.h> +#include <QtCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlinputmethod_p.h b/src/compositor/wayland_wrapper/qwlinputmethod_p.h index 58830d1c..2cfa14b9 100644 --- a/src/compositor/wayland_wrapper/qwlinputmethod_p.h +++ b/src/compositor/wayland_wrapper/qwlinputmethod_p.h @@ -41,7 +41,7 @@ #ifndef QTWAYLAND_QWLINPUTMETHOD_H #define QTWAYLAND_QWLINPUTMETHOD_H -#include <qwayland-server-input-method.h> +#include <QtCompositor/private/qwayland-server-input-method.h> #include <QObject> #include <QScopedPointer> diff --git a/src/compositor/wayland_wrapper/qwlinputmethodcontext_p.h b/src/compositor/wayland_wrapper/qwlinputmethodcontext_p.h index 9ceb8bf8..5060d4d6 100644 --- a/src/compositor/wayland_wrapper/qwlinputmethodcontext_p.h +++ b/src/compositor/wayland_wrapper/qwlinputmethodcontext_p.h @@ -41,7 +41,7 @@ #ifndef QTWAYLAND_QWLINPUTMETHODCONTEXT_P_H #define QTWAYLAND_QWLINPUTMETHODCONTEXT_P_H -#include <qwayland-server-input-method.h> +#include <QtCompositor/private/qwayland-server-input-method.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlinputpanel_p.h b/src/compositor/wayland_wrapper/qwlinputpanel_p.h index 87a8c6a5..75d795e4 100644 --- a/src/compositor/wayland_wrapper/qwlinputpanel_p.h +++ b/src/compositor/wayland_wrapper/qwlinputpanel_p.h @@ -43,7 +43,7 @@ #include <QtCompositor/qwaylandexport.h> -#include <qwayland-server-input-method.h> +#include <QtCompositor/private/qwayland-server-input-method.h> #include <QRect> #include <QScopedPointer> diff --git a/src/compositor/wayland_wrapper/qwlinputpanelsurface_p.h b/src/compositor/wayland_wrapper/qwlinputpanelsurface_p.h index f9d4dfee..89c85895 100644 --- a/src/compositor/wayland_wrapper/qwlinputpanelsurface_p.h +++ b/src/compositor/wayland_wrapper/qwlinputpanelsurface_p.h @@ -41,7 +41,7 @@ #ifndef QTWAYLAND_QWLINPUTPANELSURFACE_P_H #define QTWAYLAND_QWLINPUTPANELSURFACE_P_H -#include <qwayland-server-input-method.h> +#include <QtCompositor/private/qwayland-server-input-method.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlkeyboard_p.h b/src/compositor/wayland_wrapper/qwlkeyboard_p.h index a350a746..4d783f77 100644 --- a/src/compositor/wayland_wrapper/qwlkeyboard_p.h +++ b/src/compositor/wayland_wrapper/qwlkeyboard_p.h @@ -45,7 +45,7 @@ #include <QtCompositor/qwaylandexport.h> #include <QObject> -#include <qwayland-server-wayland.h> +#include <QtCompositor/private/qwayland-server-wayland.h> #include <QtCore/QByteArray> diff --git a/src/compositor/wayland_wrapper/qwloutput_p.h b/src/compositor/wayland_wrapper/qwloutput_p.h index 514d3e9f..738a73fc 100644 --- a/src/compositor/wayland_wrapper/qwloutput_p.h +++ b/src/compositor/wayland_wrapper/qwloutput_p.h @@ -44,7 +44,7 @@ #include <QtCore/QRect> #include <QtCore/QList> -#include <qwayland-server-wayland.h> +#include <QtCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlpointer_p.h b/src/compositor/wayland_wrapper/qwlpointer_p.h index 3200e102..ed53b048 100644 --- a/src/compositor/wayland_wrapper/qwlpointer_p.h +++ b/src/compositor/wayland_wrapper/qwlpointer_p.h @@ -47,7 +47,7 @@ #include <QtCore/QList> #include <QtCore/QPoint> -#include <qwayland-server-wayland.h> +#include <QtCompositor/private/qwayland-server-wayland.h> #include <stdint.h> diff --git a/src/compositor/wayland_wrapper/qwlqtkey_p.h b/src/compositor/wayland_wrapper/qwlqtkey_p.h index 012ef388..6257e0a9 100644 --- a/src/compositor/wayland_wrapper/qwlqtkey_p.h +++ b/src/compositor/wayland_wrapper/qwlqtkey_p.h @@ -45,7 +45,7 @@ #include "wayland-util.h" -#include "qwayland-server-qtkey-extension.h" +#include <QtCompositor/private/qwayland-server-qtkey-extension.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlqttouch_p.h b/src/compositor/wayland_wrapper/qwlqttouch_p.h index 2610936a..f2729c99 100644 --- a/src/compositor/wayland_wrapper/qwlqttouch_p.h +++ b/src/compositor/wayland_wrapper/qwlqttouch_p.h @@ -42,7 +42,7 @@ #define WLTOUCH_H #include <private/qwlcompositor_p.h> -#include "qwayland-server-touch-extension.h" +#include <QtCompositor/private/qwayland-server-touch-extension.h> #include "wayland-util.h" QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlregion_p.h b/src/compositor/wayland_wrapper/qwlregion_p.h index f905d96b..06d21ff3 100644 --- a/src/compositor/wayland_wrapper/qwlregion_p.h +++ b/src/compositor/wayland_wrapper/qwlregion_p.h @@ -46,7 +46,7 @@ #include <QRegion> #include <wayland-util.h> -#include "qwayland-server-wayland.h" +#include <QtCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlshellsurface_p.h b/src/compositor/wayland_wrapper/qwlshellsurface_p.h index 91042934..18ecdabb 100644 --- a/src/compositor/wayland_wrapper/qwlshellsurface_p.h +++ b/src/compositor/wayland_wrapper/qwlshellsurface_p.h @@ -50,7 +50,7 @@ #include <QSet> #include <private/qwlpointer_p.h> -#include <qwayland-server-wayland.h> +#include <QtCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlsubsurface_p.h b/src/compositor/wayland_wrapper/qwlsubsurface_p.h index 6f6ad120..938c2be3 100644 --- a/src/compositor/wayland_wrapper/qwlsubsurface_p.h +++ b/src/compositor/wayland_wrapper/qwlsubsurface_p.h @@ -43,7 +43,7 @@ #include <private/qwlsurface_p.h> -#include "wayland-sub-surface-extension-server-protocol.h" +#include <QtCompositor/private/wayland-sub-surface-extension-server-protocol.h> #include <QtCore/QLinkedList> diff --git a/src/compositor/wayland_wrapper/qwlsurface_p.h b/src/compositor/wayland_wrapper/qwlsurface_p.h index 9741a216..101d8938 100644 --- a/src/compositor/wayland_wrapper/qwlsurface_p.h +++ b/src/compositor/wayland_wrapper/qwlsurface_p.h @@ -59,7 +59,7 @@ #include <wayland-util.h> -#include "qwayland-server-wayland.h" +#include <QtCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwltextinput_p.h b/src/compositor/wayland_wrapper/qwltextinput_p.h index c624387a..7bfe6b88 100644 --- a/src/compositor/wayland_wrapper/qwltextinput_p.h +++ b/src/compositor/wayland_wrapper/qwltextinput_p.h @@ -41,7 +41,7 @@ #ifndef QTWAYLAND_QWLTEXTINPUT_P_H #define QTWAYLAND_QWLTEXTINPUT_P_H -#include <qwayland-server-text.h> +#include <QtCompositor/private/qwayland-server-text.h> #include <QRect> diff --git a/src/compositor/wayland_wrapper/qwltextinputmanager_p.h b/src/compositor/wayland_wrapper/qwltextinputmanager_p.h index 081fdfa9..2d9be14d 100644 --- a/src/compositor/wayland_wrapper/qwltextinputmanager_p.h +++ b/src/compositor/wayland_wrapper/qwltextinputmanager_p.h @@ -41,7 +41,7 @@ #ifndef QTWAYLAND_QWLTEXTINPUTMANAGER_P_H #define QTWAYLAND_QWLTEXTINPUTMANAGER_P_H -#include <qwayland-server-text.h> +#include <QtCompositor/private/qwayland-server-text.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwltouch_p.h b/src/compositor/wayland_wrapper/qwltouch_p.h index d967b714..69560980 100644 --- a/src/compositor/wayland_wrapper/qwltouch_p.h +++ b/src/compositor/wayland_wrapper/qwltouch_p.h @@ -46,7 +46,7 @@ #include <QtCore/QPoint> -#include <qwayland-server-wayland.h> +#include <QtCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h index ccf5d4e8..4b2a753e 100644 --- a/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h +++ b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h @@ -42,7 +42,7 @@ #define WAYLANDWINDOWMANAGERINTEGRATION_H #include <QtCompositor/qwaylandexport.h> -#include "qwayland-server-windowmanager.h" +#include <QtCompositor/private/qwayland-server-windowmanager.h> #include <QObject> #include <QMap> |