diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-04-24 14:01:01 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-04-25 04:28:29 +0000 |
| commit | f8a16e0edb11d3acc7f2448a4bcd0eb9606b39dc (patch) | |
| tree | 25ef69c835f9fd9badc27ed43dbf785f1d863c08 /examples | |
| parent | 434f3e9a952b5858abc1f0ed1179ea5d2fca6a19 (diff) | |
Remove waylandclient-private dependency from custom-extension example
We really only depend on gui-private.
Change-Id: Ic774cf94d8d94194c26d3852206ecff488948196
Reviewed-by: Drew DeVault <qt@cmpwn.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'examples')
5 files changed, 5 insertions, 8 deletions
diff --git a/examples/wayland/custom-extension/client-common/customextension.cpp b/examples/wayland/custom-extension/client-common/customextension.cpp index 90e1f4377..aa0cb58a4 100644 --- a/examples/wayland/custom-extension/client-common/customextension.cpp +++ b/examples/wayland/custom-extension/client-common/customextension.cpp @@ -49,8 +49,6 @@ ****************************************************************************/ #include "customextension.h" -#include <QtWaylandClient/private/qwaylanddisplay_p.h> -#include <QtWaylandClient/private/qwaylandintegration_p.h> #include <QtGui/QGuiApplication> #include <QtGui/QWindow> #include <QtGui/QPlatformSurfaceEvent> diff --git a/examples/wayland/custom-extension/client-common/customextension.h b/examples/wayland/custom-extension/client-common/customextension.h index 5e48ea75e..7a188c3d6 100644 --- a/examples/wayland/custom-extension/client-common/customextension.h +++ b/examples/wayland/custom-extension/client-common/customextension.h @@ -51,9 +51,8 @@ #ifndef CUSTOMEXTENSION_H #define CUSTOMEXTENSION_H -#include <qpa/qwindowsysteminterface.h> -#include <QtWaylandClient/private/qwayland-wayland.h> -#include <QtWaylandClient/qwaylandclientextension.h> +#include <QtWaylandClient/QWaylandClientExtension> +#include <QtGui/QWindow> #include "qwayland-custom.h" QT_BEGIN_NAMESPACE diff --git a/examples/wayland/custom-extension/compositor/compositor.pro b/examples/wayland/custom-extension/compositor/compositor.pro index b0ff7b2f7..751b5ca3d 100644 --- a/examples/wayland/custom-extension/compositor/compositor.pro +++ b/examples/wayland/custom-extension/compositor/compositor.pro @@ -1,6 +1,6 @@ QT += core gui qml -QT += waylandcompositor-private +QT += waylandcompositor CONFIG += wayland-scanner CONFIG += c++11 diff --git a/examples/wayland/custom-extension/cpp-client/cpp-client.pro b/examples/wayland/custom-extension/cpp-client/cpp-client.pro index b700f2367..388a09bfa 100644 --- a/examples/wayland/custom-extension/cpp-client/cpp-client.pro +++ b/examples/wayland/custom-extension/cpp-client/cpp-client.pro @@ -1,4 +1,4 @@ -QT += waylandclient-private gui-private +QT += waylandclient gui-private CONFIG += wayland-scanner WAYLANDCLIENTSOURCES += ../protocol/custom.xml diff --git a/examples/wayland/custom-extension/qml-client/qml-client.pro b/examples/wayland/custom-extension/qml-client/qml-client.pro index d45067e5a..a8fa420af 100644 --- a/examples/wayland/custom-extension/qml-client/qml-client.pro +++ b/examples/wayland/custom-extension/qml-client/qml-client.pro @@ -1,5 +1,5 @@ TEMPLATE = app -QT += qml quick waylandclient-private +QT += qml quick waylandclient gui-private CONFIG += wayland-scanner WAYLANDCLIENTSOURCES += ../protocol/custom.xml |