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

Use the instealled headers in the public headers for client

Browse Source 
and use the install generated headers feature for wayland-scanner

Change-Id: I6cba9f02f8739ef5fbeeb171582e6d766d9c0fdb
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This commit is contained in:
Jorgen Lind 2013-11-18 12:24:07 +01:00 committed by The Qt Project
parent 0984830c33
commit e9613ce5b7
15 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,6 @@ WAYLANDCLIENTSOURCES += \
../extensions/windowmanager.xml \ ../extensions/windowmanager.xml \
../3rdparty/protocol/text.xml \ ../3rdparty/protocol/text.xml \
SOURCES += qwaylandintegration.cpp \ SOURCES += qwaylandintegration.cpp \
qwaylandnativeinterface.cpp \ qwaylandnativeinterface.cpp \
qwaylandshmbackingstore.cpp \ qwaylandshmbackingstore.cpp \
@ -100,4 +99,3 @@ contains(DEFINES, QT_WAYLAND_GL_SUPPORT) {
SOURCES += qwaylandglintegration.cpp SOURCES += qwaylandglintegration.cpp
HEADERS += qwaylandglintegration.h HEADERS += qwaylandglintegration.h
} }

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

@ -42,7 +42,7 @@
#ifndef QWAYLANDBUFFER_H #ifndef QWAYLANDBUFFER_H
#define QWAYLANDBUFFER_H #define QWAYLANDBUFFER_H
#include "qwaylandclientexport.h" #include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QSize> #include <QtCore/QSize>
#include <QtCore/QRect> #include <QtCore/QRect>

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

@ -42,7 +42,7 @@
#ifndef QWAYLANDDATADEVICEMANAGER_H #ifndef QWAYLANDDATADEVICEMANAGER_H
#define QWAYLANDDATADEVICEMANAGER_H #define QWAYLANDDATADEVICEMANAGER_H
#include "qwaylanddisplay.h" #include <QtWaylandClient/qwaylanddisplay.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

4
src/plugins/platforms/wayland/qwaylanddatasource.h
View File

@ -42,7 +42,9 @@
#ifndef QWAYLANDDATASOURCE_H #ifndef QWAYLANDDATASOURCE_H
#define QWAYLANDDATASOURCE_H #define QWAYLANDDATASOURCE_H
#include "qwaylanddisplay.h" #include <QtWaylandClient/qwaylanddatadevicemanager.h>
#include <QtWaylandClient/private/wayland-wayland-client-protocol.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -48,8 +48,8 @@
#include <QtCore/QWaitCondition> #include <QtCore/QWaitCondition>
#include <wayland-client.h> #include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-wayland.h>
#include <QtWaylandClient/private/qwayland-wayland.h>
#include <QtWaylandClient/qwaylandclientexport.h> #include <QtWaylandClient/qwaylandclientexport.h>
struct wl_cursor_image; struct wl_cursor_image;

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

@ -47,7 +47,7 @@
#include <QtGui/QDrag> #include <QtGui/QDrag>
#include <QtCore/QMimeData> #include <QtCore/QMimeData>
#include "qwaylanddisplay.h" #include <QtWaylandClient/qwaylanddisplay.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -42,7 +42,7 @@
#ifndef QWAYLANDEXTENDEDOUTPUT_H #ifndef QWAYLANDEXTENDEDOUTPUT_H
#define QWAYLANDEXTENDEDOUTPUT_H #define QWAYLANDEXTENDEDOUTPUT_H
#include "qwaylanddisplay.h" #include <QtWaylandClient/qwaylanddisplay.h>
#include <QtWaylandClient/private/qwayland-output-extension.h> #include <QtWaylandClient/private/qwayland-output-extension.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -42,7 +42,7 @@
#ifndef QWAYLANDINPUTDEVICE_H #ifndef QWAYLANDINPUTDEVICE_H
#define QWAYLANDINPUTDEVICE_H #define QWAYLANDINPUTDEVICE_H
#include "qwaylandwindow.h" #include <QtWaylandClient/qwaylandwindow.h>
#include <QSocketNotifier> #include <QSocketNotifier>
#include <QObject> #include <QObject>

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

@ -42,7 +42,7 @@
#ifndef QWAYLANDNATIVEINTERFACE_H #ifndef QWAYLANDNATIVEINTERFACE_H
#define QWAYLANDNATIVEINTERFACE_H #define QWAYLANDNATIVEINTERFACE_H
#include "qwaylandscreen.h" #include <QtWaylandClient/qwaylandscreen.h>
#include <QVariantMap> #include <QVariantMap>
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>

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

@ -42,7 +42,7 @@
#ifndef QWAYLANDQTKEY_H #ifndef QWAYLANDQTKEY_H
#define QWAYLANDQTKEY_H #define QWAYLANDQTKEY_H
#include "qwaylanddisplay.h" #include <QtWaylandClient/qwaylanddisplay.h>
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <QtWaylandClient/private/qwayland-qtkey-extension.h> #include <QtWaylandClient/private/qwayland-qtkey-extension.h>

6
src/plugins/platforms/wayland/qwaylandshmbackingstore.h
View File

@ -42,10 +42,10 @@
#ifndef QWAYLANDSHMBACKINGSTORE_H #ifndef QWAYLANDSHMBACKINGSTORE_H
#define QWAYLANDSHMBACKINGSTORE_H #define QWAYLANDSHMBACKINGSTORE_H
#include "qwaylandbuffer.h" #include <QtWaylandClient/qwaylandbuffer.h>
#include "qwaylanddecoration.h" #include <QtWaylandClient/qwaylanddecoration.h>
#include "qwaylandshmwindow.h" #include <QtWaylandClient/qwaylandshmwindow.h>
#include <qpa/qplatformbackingstore.h> #include <qpa/qplatformbackingstore.h>
#include <QtGui/QImage> #include <QtGui/QImage>

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

@ -42,7 +42,7 @@
#ifndef QWAYLANDSHMWINDOW_H #ifndef QWAYLANDSHMWINDOW_H
#define QWAYLANDSHMWINDOW_H #define QWAYLANDSHMWINDOW_H
#include "qwaylandwindow.h" #include <QtWaylandClient/qwaylandwindow.h>
#include <QtGui/QRegion> #include <QtGui/QRegion>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -42,7 +42,7 @@
#ifndef QWAYLANDTOUCh_H #ifndef QWAYLANDTOUCh_H
#define QWAYLANDTOUCH_H #define QWAYLANDTOUCH_H
#include "qwaylanddisplay.h" #include <QtWaylandClient/qwaylanddisplay.h>
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <QtWaylandClient/private/qwayland-touch-extension.h> #include <QtWaylandClient/private/qwayland-touch-extension.h>

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

@ -48,7 +48,7 @@
#include <qpa/qplatformwindow.h> #include <qpa/qplatformwindow.h>
#include "qwaylanddisplay.h" #include <QtWaylandClient/qwaylanddisplay.h>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>

4
src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.h
View File

@ -46,10 +46,10 @@
#include <QtCore/QScopedPointer> #include <QtCore/QScopedPointer>
#include "wayland-client.h" #include "wayland-client.h"
#include "qwaylanddisplay.h" #include <QtWaylandClient/qwaylanddisplay.h>
#include <qpa/qplatformservices.h> #include <qpa/qplatformservices.h>
#include "QtWaylandClient/private/qwayland-windowmanager.h" #include <QtWaylandClient/private/qwayland-windowmanager.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE