diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-08-14 13:10:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-14 16:14:55 +0200 |
| commit | 7362413785e1e199a62320494631f27dd1a4da59 (patch) | |
| tree | e4973dbfb9ac67d7e78f6a780c8e41e5667f4099 /src/compositor/extensions/extensions.pri | |
| parent | ca9be5cab503d85831653d6c4bc9c59bd0f6ad57 (diff) | |
| parent | 43d8a3091894ceb4ab934167b2f3eda27564eb6d (diff) | |
Merge remote-tracking branch 'qt/5.12' into 5.13
Conflicts:
src/compositor/configure.json
sync.profile
tests/auto/auto.pro
Change-Id: Ia6d1512aa9ad49ac7f92ae88f23026dc0ee2ccc5
Diffstat (limited to 'src/compositor/extensions/extensions.pri')
| -rw-r--r-- | src/compositor/extensions/extensions.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/compositor/extensions/extensions.pri b/src/compositor/extensions/extensions.pri index 361f93984..d8f0069de 100644 --- a/src/compositor/extensions/extensions.pri +++ b/src/compositor/extensions/extensions.pri @@ -83,6 +83,11 @@ qtHaveModule(quick):contains(QT_CONFIG, opengl) { extensions/qwaylandxdgshellv6integration.cpp \ extensions/qwaylandxdgshellintegration.cpp + qtConfig(wayland-compositor-texture-sharing-experimental) { + HEADERS += extensions/qwltexturesharingextension_p.h + SOURCES += extensions/qwltexturesharingextension.cpp + WAYLANDSERVERSOURCES += ../extensions/qt-texture-sharing-unstable-v1.xml + } } include ($$PWD/pregenerated/xdg-shell-v5.pri) |