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

Merge remote-tracking branch 'origin/5.8' into dev

Browse Source 
Change-Id: Idd91b55bc2b1e3506d9385b3352aeda06de6d4bc
This commit is contained in:
Liang Qi 2016-12-12 09:49:15 +01:00
commit fb41b1c4e1
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
"Name": "Wayland Protocol",
"QDocModule": "qtwaylandcompositor",
"QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
"Files": "wayland.xml",
"Description": "Wayland is a protocol for a compositor to talk to its clients.",
"Homepage": "https://wayland.freedesktop.org",
@ -22,6 +23,7 @@
"Name": "Wayland IVI Extension Protocol",
"QDocModule": "qtwaylandcompositor",
"QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
"Files": "ivi-controller.xml ivi-application.xml",
"Description": "\"Wayland IVI Extension\" is forked from IVI Layer Management to define a common set of APIs by wayland style protocol and provide reference implementation which can be loaded on Weston.",
"Homepage": "http://projects.genivi.org/wayland-ivi-extension",
@ -39,6 +41,7 @@ Copyright (c) 2013 BMW Car IT GmbH"
"Name": "Wayland XDG Shell Protocol",
"QDocModule": "qtwaylandcompositor",
"QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
"Files": "xdg-shell.xml",
"Description": "The XDG-Shell protocol is an extended way to manage surfaces under Wayland compositors.",
"Homepage": "https://wayland.freedesktop.org",
@ -58,6 +61,7 @@ Copyright © 2010-2013 Intel Corporation"
"Name": "Wayland Text Input Protocol",
"QDocModule": "qtwaylandcompositor",
"QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
"Files": "text-input-unstable-v2.xml",
"Description": "Adds support for text input and input methods to applications.",
"Homepage": "https://wayland.freedesktop.org",

1
src/plugins/platforms/wayland/global/qwaylandclientextension.h
View File

@ -40,6 +40,7 @@
#include <QObject>
#include <QtWaylandClient/qtwaylandclientglobal.h>
struct wl_interface;
struct wl_registry;
QT_BEGIN_NAMESPACE

5
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -217,6 +217,11 @@ void QWaylandIntegration::initialize()
int fd = wl_display_get_fd(mDisplay->wl_display());
QSocketNotifier *sn = new QSocketNotifier(fd, QSocketNotifier::Read, mDisplay.data());
QObject::connect(sn, SIGNAL(activated(int)), mDisplay.data(), SLOT(flushRequests()));
if (mDisplay->screens().isEmpty()) {
qWarning() << "Running on a compositor with no screens is not supported";
::exit(EXIT_FAILURE);
}
}
QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const