diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-07 03:04:13 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-07 03:04:14 +0100 |
| commit | b52a97dc9693a0d41ec492e330846a75b91f4ae2 (patch) | |
| tree | 6d809a41f592826aeec53610817769a90bebb102 | |
| parent | 7458370a6facf4261df90eea7230382756608a2e (diff) | |
| parent | 0f0fbf0a70940379a99618d2069721471e3fc631 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ia8c20b7bc5ffb49beba358a2c47ac7347e1d3ecb
| -rw-r--r-- | src/compositor/extensions/extensions.pri | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/compositor/extensions/extensions.pri b/src/compositor/extensions/extensions.pri index 61ab043ea..06e3ef9ee 100644 --- a/src/compositor/extensions/extensions.pri +++ b/src/compositor/extensions/extensions.pri @@ -8,6 +8,7 @@ WAYLANDSERVERSOURCES += \ ../extensions/touch-extension.xml \ ../extensions/qt-key-unstable-v1.xml \ ../extensions/qt-windowmanager.xml \ + ../extensions/qt-texture-sharing-unstable-v1.xml \ ../3rdparty/protocol/text-input-unstable-v2.xml \ ../3rdparty/protocol/viewporter.xml \ ../3rdparty/protocol/scaler.xml \ @@ -96,9 +97,6 @@ qtHaveModule(quick) { extensions/qwaylandxdgshellintegration.cpp \ qtConfig(opengl) { - WAYLANDSERVERSOURCES += \ - ../extensions/qt-texture-sharing-unstable-v1.xml - HEADERS += \ extensions/qwltexturesharingextension_p.h |