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 /sync.profile | |
| parent | ca9be5cab503d85831653d6c4bc9c59bd0f6ad57 (diff) | |
| parent | 43d8a3091894ceb4ab934167b2f3eda27564eb6d (diff) | |
| download | qtwayland-7362413785e1e199a62320494631f27dd1a4da59.tar.gz | |
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 'sync.profile')
| -rw-r--r-- | sync.profile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sync.profile b/sync.profile index a06caa37..1aa935c3 100644 --- a/sync.profile +++ b/sync.profile @@ -59,6 +59,7 @@ "^qwayland-server-qt-windowmanager.h", "^qwayland-server-qt-key-unstable-v1.h", "^qwayland-server-scaler.h", + "^qwayland-server-qt-texture-sharing-unstable-v1.h", "^qwayland-server-server-buffer-extension.h", "^qwayland-server-text-input-unstable-v2.h", "^qwayland-server-touch-extension.h", @@ -72,6 +73,7 @@ "^wayland-qt-windowmanager-server-protocol.h", "^wayland-qt-key-unstable-v1-server-protocol.h", "^wayland-scaler-server-protocol.h", + "^wayland-qt-texture-sharing-unstable-v1-server-protocol.h", "^wayland-server-buffer-extension-server-protocol.h", "^wayland-text-input-unstable-v2-server-protocol.h", "^wayland-viewporter-server-protocol.h", |