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

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

Browse Source 
also amended the libhybris plugin according to the merged change.

Change-Id: I2987043cf21936aa0f221343d00dacdc574be06a
This commit is contained in:
Oswald Buddenhagen 2014-04-15 16:08:59 +02:00
commit 47d979b9fa
10 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/client.pro
View File

@ -3,6 +3,8 @@ QT += core-private gui-private
QT_FOR_PRIVATE += platformsupport-private QT_FOR_PRIVATE += platformsupport-private
MODULE=waylandclient MODULE=waylandclient
MODULE_PLUGIN_TYPES = wayland-graphics-integration-client
load(qt_module) load(qt_module)
CONFIG += link_pkgconfig qpa/genericunixfontdatabase wayland-scanner CONFIG += link_pkgconfig qpa/genericunixfontdatabase wayland-scanner

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp
View File

@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
#ifndef QT_NO_LIBRARY #ifndef QT_NO_LIBRARY
Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
(QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration/client"), Qt::CaseInsensitive)) (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-client"), Qt::CaseInsensitive))
Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader,
(QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
#endif #endif

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp
View File

@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
#ifndef QT_NO_LIBRARY #ifndef QT_NO_LIBRARY
Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
(QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration/client"), Qt::CaseInsensitive)) (QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-client"), Qt::CaseInsensitive))
Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader,
(QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) (QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
#endif #endif

2
src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/brcm-egl.pro
View File

@ -1,4 +1,4 @@
PLUGIN_TYPE = wayland-graphics-integration/client PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin) load(qt_plugin)
QT += waylandclient-private QT += waylandclient-private

2
src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/drm-egl-server.pro
View File

@ -1,4 +1,4 @@
PLUGIN_TYPE = wayland-graphics-integration/client PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin) load(qt_plugin)
QT += waylandclient-private QT += waylandclient-private

2
src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/libhybris-egl-server.pro
View File

@ -1,4 +1,4 @@
PLUGIN_TYPE = wayland-graphics-integration/client PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin) load(qt_plugin)
QT += waylandclient-private QT += waylandclient-private

2
src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/wayland-egl.pro
View File

@ -1,4 +1,4 @@
PLUGIN_TYPE = wayland-graphics-integration/client PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin) load(qt_plugin)
QT += waylandclient-private QT += waylandclient-private

2
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/xcomposite-egl.pro
View File

@ -1,4 +1,4 @@
PLUGIN_TYPE = wayland-graphics-integration/client PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin) load(qt_plugin)
QT += waylandclient-private QT += waylandclient-private

2
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/xcomposite-glx.pro
View File

@ -1,4 +1,4 @@
PLUGIN_TYPE = wayland-graphics-integration/client PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin) load(qt_plugin)
QT += waylandclient-private QT += waylandclient-private

6
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
View File

@ -517,6 +517,12 @@ void QWaylandInputDevice::Pointer::pointer_axis(uint32_t time, uint32_t axis, in
QPoint pixelDelta; QPoint pixelDelta;
QPoint angleDelta; QPoint angleDelta;
if (window == NULL) {
// We destroyed the pointer focus surface, but the server
// didn't get the message yet.
return;
}
//normalize value and inverse axis //normalize value and inverse axis
int valueDelta = wl_fixed_to_int(value) * -12; int valueDelta = wl_fixed_to_int(value) * -12;