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

Merge remote-tracking branch 'qt/5.7' into 5.7.0

Browse Source 
Change-Id: I8396ea4fc9f656accd2e97e3c78570bff64928cd
This commit is contained in:
Paul Olav Tvete 2016-05-20 14:35:43 +02:00
commit 9272efd271
57 changed files with 64 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,9 +99,6 @@ HEADERS += qwaylandintegration_p.h \
qwaylandsubsurface_p.h \
qwaylandtouch_p.h \
qwaylandqtkey_p.h \
../shared/qwaylandmimehelper.h \
../shared/qwaylandxkb.h \
../shared/qwaylandinputmethodeventbuilder.h \
qwaylandabstractdecoration_p.h \
qwaylanddecorationfactory_p.h \
qwaylanddecorationplugin_p.h \
@ -109,6 +106,11 @@ HEADERS += qwaylandintegration_p.h \
qwaylandinputcontext_p.h \
qwaylanddatadevice_p.h \
qwaylandshm_p.h \
qwaylandclientexport.h \
../shared/qwaylandinputmethodeventbuilder_p.h \
../shared/qwaylandmimehelper_p.h \
../shared/qwaylandxkb_p.h \
../shared/qwaylandshmformathelper_p.h
include(hardwareintegration/hardwareintegration.pri)
include(shellintegration/shellintegration.pri)

10
src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
View File

@ -43,8 +43,6 @@
QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate()
: QObjectPrivate()
, waylandIntegration(NULL)
@ -57,7 +55,7 @@ QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate()
if (QGuiApplication::platformNativeInterface()) {
waylandDisplay = static_cast<struct ::wl_display*>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_display"));
} else {
waylandIntegration = new QWaylandIntegration();
waylandIntegration = new QtWaylandClient::QWaylandIntegration();
waylandDisplay = waylandIntegration->display()->wl_display();
}
@ -84,7 +82,7 @@ QWaylandClientExtension::QWaylandClientExtension(const int ver)
d->version = ver;
}
QWaylandIntegration *QWaylandClientExtension::integration() const
QtWaylandClient::QWaylandIntegration *QWaylandClientExtension::integration() const
{
Q_D(const QWaylandClientExtension);
return d->waylandIntegration;
@ -105,12 +103,10 @@ void QWaylandClientExtension::setVersion(const int ver)
}
}
bool QWaylandClientExtension::active() const
bool QWaylandClientExtension::isActive() const
{
Q_D(const QWaylandClientExtension);
return d->active;
}
}
QT_END_NAMESPACE

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

@ -39,13 +39,14 @@
#include <QObject>
#include <qpa/qwindowsysteminterface.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h>
QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
class QWaylandIntegration;
}
class QWaylandClientExtensionPrivate;
class QWaylandClientExtensionTemplatePrivate;
@ -54,13 +55,13 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtension : public QObject
Q_OBJECT
Q_DECLARE_PRIVATE(QWaylandClientExtension)
Q_PROPERTY(int protocolVersion READ version NOTIFY versionChanged)
Q_PROPERTY(bool active READ active NOTIFY activeChanged)
Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
public:
QWaylandClientExtension(const int version);
QWaylandIntegration *integration() const;
QtWaylandClient::QWaylandIntegration *integration() const;
int version() const;
bool active() const;
bool isActive() const;
virtual const struct wl_interface *extensionInterface() const = 0;
virtual void bind(struct ::wl_registry *registry, int id, int version) = 0;
@ -101,8 +102,6 @@ public:
}
};
}
QT_END_NAMESPACE
#endif // QWAYLANDCLIENTEXTENSION_H

6
src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
View File

@ -55,15 +55,13 @@
QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionPrivate : public QObjectPrivate, public QtWayland::wl_registry
{
Q_DECLARE_PUBLIC(QWaylandClientExtension)
public:
QWaylandClientExtensionPrivate();
QWaylandIntegration *waylandIntegration;
QtWaylandClient::QWaylandIntegration *waylandIntegration;
int version;
bool active;
@ -79,8 +77,6 @@ public:
{ }
};
}
QT_END_NAMESPACE
#endif /*QWAYLANDCLIENTEXTENSION_P_H*/

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h
View File

@ -52,7 +52,7 @@
//
#include <QtCore/qglobal.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h
View File

@ -52,7 +52,7 @@
//
#include <QtWaylandClient/private/qwayland-hardware-integration.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h
View File

@ -55,7 +55,7 @@
#include <QtGui/qopengl.h>
#include <QtWaylandClient/private/qwayland-server-buffer-extension.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>

2
src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h
View File

@ -52,7 +52,7 @@
//
#include <QtCore/qglobal.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <stdint.h>

2
src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>

2
src/plugins/platforms/wayland/qwaylandabstractdecoration_p.h
View File

@ -59,7 +59,7 @@
#include <QtGui/QColor>
#include <QtGui/QStaticText>
#include <QtGui/QImage>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <wayland-client.h>

2
src/plugins/platforms/wayland/qwaylandbuffer_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QSize>
#include <QtCore/QRect>

0
src/plugins/platforms/wayland/qwaylandclientexport_p.h → src/plugins/platforms/wayland/qwaylandclientexport.h
View File

2
src/plugins/platforms/wayland/qwaylandclipboard_p.h
View File

@ -54,7 +54,7 @@
#include <qpa/qplatformclipboard.h>
#include <QtCore/QVariant>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandcursor_p.h
View File

@ -53,7 +53,7 @@
#include <qpa/qplatformcursor.h>
#include <QtCore/QMap>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
struct wl_cursor;
struct wl_cursor_image;

2
src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylanddataoffer_p.h
View File

@ -53,7 +53,7 @@
#include <QtGui/private/qdnd_p.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylanddatasource.cpp
View File

@ -41,7 +41,7 @@
#include "qwaylanddataoffer_p.h"
#include "qwaylanddatadevicemanager_p.h"
#include "qwaylandinputdevice_p.h"
#include "qwaylandmimehelper.h"
#include "qwaylandmimehelper_p.h"
#include <QtCore/QFile>

2
src/plugins/platforms/wayland/qwaylanddatasource_p.h
View File

@ -54,7 +54,7 @@
#include <QObject>
#include <QtWaylandClient/private/qwayland-wayland.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylanddecorationfactory_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylanddecorationplugin_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>

2
src/plugins/platforms/wayland/qwaylanddisplay_p.h
View File

@ -60,7 +60,7 @@
#include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-wayland.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-xdg-shell.h>
#include <QtWaylandClient/private/qwaylandshm_p.h>

2
src/plugins/platforms/wayland/qwaylanddnd_p.h
View File

@ -57,7 +57,7 @@
#include <QtGui/QDrag>
#include <QtCore/QMimeData>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandextendedsurface_p.h
View File

@ -54,7 +54,7 @@
#include <QtCore/QString>
#include <QtCore/QVariant>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-surface-extension.h>

4
src/plugins/platforms/wayland/qwaylandinputcontext.cpp
View File

@ -48,9 +48,9 @@
#include "qwaylanddisplay_p.h"
#include "qwaylandinputdevice_p.h"
#include "qwaylandinputmethodeventbuilder.h"
#include "qwaylandinputmethodeventbuilder_p.h"
#include "qwaylandwindow_p.h"
#include "qwaylandxkb.h"
#include "qwaylandxkb_p.h"
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandinputcontext_p.h
View File

@ -60,7 +60,7 @@
#include <QVector>
#include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h>
#include <qwaylandinputmethodeventbuilder.h>
#include <qwaylandinputmethodeventbuilder_p.h>
QT_BEGIN_NAMESPACE

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

@ -49,7 +49,7 @@
#include "qwaylandcursor_p.h"
#include "qwaylanddisplay_p.h"
#include "qwaylandshmbackingstore_p.h"
#include "../shared/qwaylandxkb.h"
#include "../shared/qwaylandxkb_p.h"
#include "qwaylandinputcontext_p.h"
#include <QtGui/private/qpixmap_raster_p.h>

2
src/plugins/platforms/wayland/qwaylandintegration_p.h
View File

@ -53,7 +53,7 @@
#include <qpa/qplatformintegration.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE
namespace QtWaylandClient {

2
src/plugins/platforms/wayland/qwaylandnativeinterface_p.h
View File

@ -54,7 +54,7 @@
#include <QVariantMap>
#include <qpa/qplatformnativeinterface.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandqtkey_p.h
View File

@ -53,7 +53,7 @@
#include <qpa/qwindowsysteminterface.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-qtkey-extension.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandscreen_p.h
View File

@ -52,7 +52,7 @@
//
#include <qpa/qplatformscreen.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h>

2
src/plugins/platforms/wayland/qwaylandshellsurface_p.h
View File

@ -57,7 +57,7 @@
#include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-wayland.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandshm.cpp
View File

@ -39,7 +39,7 @@
#include <QtWaylandClient/private/qwaylandshm_p.h>
#include <QtWaylandClient/private/qwaylanddisplay_p.h>
#include "qwaylandshmformathelper.h"
#include "qwaylandshmformathelper_p.h"
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandshm_p.h
View File

@ -54,7 +54,7 @@
#include <QVector>
#include <QImage>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h>
QT_BEGIN_NAMESPACE

1
src/plugins/platforms/wayland/qwaylandsubsurface.cpp
View File

@ -60,6 +60,7 @@ QWaylandSubSurface::QWaylandSubSurface(QWaylandWindow *window, QWaylandWindow *p
QWaylandSubSurface::~QWaylandSubSurface()
{
m_parent->mChildren.removeOne(this);
destroy();
}
void QWaylandSubSurface::setSync()

2
src/plugins/platforms/wayland/qwaylandsubsurface_p.h
View File

@ -56,7 +56,7 @@
#include <QtCore/qglobal.h>
#include <QtCore/qmutex.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtWaylandClient/private/qwayland-wayland.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandtouch_p.h
View File

@ -54,7 +54,7 @@
#include <qpa/qwindowsysteminterface.h>
#include <QtWaylandClient/private/qwayland-touch-extension.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -207,7 +207,7 @@ bool QWaylandWindow::shouldCreateShellSurface() const
return false;
if (qEnvironmentVariableIsSet("QT_WAYLAND_USE_BYPASSWINDOWMANAGERHINT"))
return window()->flags() & Qt::BypassWindowManagerHint;
return !(window()->flags() & Qt::BypassWindowManagerHint);
return true;
}

2
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -59,7 +59,7 @@
#include <qpa/qplatformwindow.h>
#include <QtWaylandClient/private/qwayland-wayland.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
struct wl_egl_window;

2
src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
View File

@ -58,7 +58,7 @@
#include <QtPlatformSupport/private/qgenericunixservices_p.h>
#include <QtWaylandClient/private/qwayland-windowmanager.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandwlshellsurface_p.h
View File

@ -56,7 +56,7 @@
#include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-wayland.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include "qwaylandshellsurface_p.h"
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandxdgshell_p.h
View File

@ -56,7 +56,7 @@
#include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-xdg-shell.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include "qwaylandshellsurface_p.h"
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/qwaylandxdgsurface_p.h
View File

@ -57,7 +57,7 @@
#include <wayland-client.h>
#include <QtWaylandClient/private/qwayland-xdg-shell.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include "qwaylandshellsurface_p.h"
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.cpp
View File

@ -37,7 +37,7 @@
**
****************************************************************************/
#include "qwaylandinputmethodeventbuilder.h"
#include "qwaylandinputmethodeventbuilder_p.h"
#include <QInputMethod>
#include <QTextCharFormat>

0
src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.h → src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder_p.h
View File

2
src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp
View File

@ -37,7 +37,7 @@
**
****************************************************************************/
#include "qwaylandmimehelper.h"
#include "qwaylandmimehelper_p.h"
#include <QImage>
#include <QColor>
#include <QUrl>

0
src/plugins/platforms/wayland/shared/qwaylandmimehelper.h → src/plugins/platforms/wayland/shared/qwaylandmimehelper_p.h
View File

0
src/plugins/platforms/wayland/shared/qwaylandshmformathelper.h → src/plugins/platforms/wayland/shared/qwaylandshmformathelper_p.h
View File

2
src/plugins/platforms/wayland/shared/qwaylandxkb.cpp
View File

@ -38,7 +38,7 @@
**
****************************************************************************/
#include "qwaylandxkb.h"
#include "qwaylandxkb_p.h"
#include <QKeyEvent>
#include <QString>

0
src/plugins/platforms/wayland/shared/qwaylandxkb.h → src/plugins/platforms/wayland/shared/qwaylandxkb_p.h
View File

2
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
View File

@ -52,7 +52,7 @@
//
#include <QtCore/qglobal.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
#include <QtWaylandClient/qwaylandclientexport.h>
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>