1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge dev into 5.14

Browse Source 
Change-Id: Iaf121f1db2fea08dd4ce16136b8d68c94b182084
This commit is contained in:
Kari Oikarinen 2019-08-27 07:51:18 +03:00
commit e1f3c4f867
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/3rdparty/wayland/protocols/qt_attribution.json vendored
View File

@ -127,8 +127,9 @@ Copyright (c) 2013 BMW Car IT GmbH"
"Id": "wayland-xdg-output-protocol",
"Name": "Wayland XDG Output Protocol",
"QDocModule": "qtwaylandcompositor",
"QtUsage": "Used in the Qt Wayland platform plugin.",
"QtUsage": "Used in the Qt Wayland Compositor API, and the Qt Wayland platform plugin.",
"Files": "xdg-output-unstable-v1.xml",
"Description": "The XDG Output protocol is an extended way to describe output regions under Wayland",
"Homepage": "https://wayland.freedesktop.org",
"Version": "unstable v1, version 2",

2
tests/auto/wayland/inputcontext/inputcontext.pro
View File

@ -1,6 +1,4 @@
include (../shared/shared.pri)
QT += waylandcompositor
TARGET = tst_inputcontext
SOURCES += tst_inputcontext.cpp