diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:44:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:44:58 +0200 |
| commit | a4d68e7d78a28225c23931431f0db6ebf75f5e41 (patch) | |
| tree | ea04abea84bfa53aa4212cade81df780f4a5d89b /src/client/global | |
| parent | 5ce1c2a3bf9546171d2913c76330bc6d1b6a4789 (diff) | |
| parent | 6260c4376e598031e467416027703bd11012621d (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
examples/wayland/minimal-qml/main.qml
Change-Id: Ic34029a6aa77f2b359f40258a05421d82efd5b37
Diffstat (limited to 'src/client/global')
| -rw-r--r-- | src/client/global/qwaylandclientextension.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/global/qwaylandclientextension.h b/src/client/global/qwaylandclientextension.h index a39f32b7f..d1610c271 100644 --- a/src/client/global/qwaylandclientextension.h +++ b/src/client/global/qwaylandclientextension.h @@ -39,7 +39,9 @@ #include <QObject> #include <QtWaylandClient/qwaylandclientexport.h> -#include <QtWaylandClient/private/qwayland-wayland.h> + +struct wl_registry; + QT_BEGIN_NAMESPACE namespace QtWaylandClient { |