qtwayland: Fix building of QWaylandIntegration if some Qt5 features are disabled.
PATCH 1/1 qtwayland: Fix building of QWaylandIntegration if some Qt5 features are disabled.
From: Vesa Jääskeläinen <[email protected]>
QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL, QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and QT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland.
--- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156 +++++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
recipes-qt/qt5/qtwayland-native_git.bb +1 -0
@@ -18,6 +18,7 @@ DEPENDS = "qtbase-native wayland-native" SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " do_configure() {
recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch new file +156 -0
156 lines not on this page · raw message
recipes-qt/qt5/qtwayland_git.bb +1 -0
@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941"
Signature · 1 line
2.7.4
Quoted 6 lines · Denys Dmytriyenko
From: Vesa Jääskeläinen <[email protected]>
QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,QT_NO_CLIPBOARD,QT_NO_DRAGANDDROP,QT_NO_ACCESSIBILITYandQT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland.
Is this still needed with:
[oe] [meta-qt5][morty][PATCH] qt5: update submodule SRCREVs to 5.7.1 release
The .patch doesn't apply in 5.7.1 anymore and I haven't had time to find out why.
Quoted 200 lines
Signed-off-by Vesa Jääskeläinen <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>--- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156 +++++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patchrecipes-qt/qt5/qtwayland-native_git.bb +1
-0@@ -18,6 +18,7 @@ DEPENDS = "qtbase-native wayland-native" SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " do_configure() {recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch new file +156
-0@@ -0,0 +1,156 @@ +From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <[email protected]> +Date: Sun, 18 Sep 2016 11:51:59 +0300 +Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5 features are + disabled. + +QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL, +QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and +QT_NO_SESSIONMANAGER, these has to be taken into account when compiling +QtWayland. +--- + src/client/qwaylandintegration.cpp | 21 ++++++++++++++++++--- + src/client/qwaylandintegration_p.h | 12 ++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp +index 39fff53..481e3d6 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -39,7 +39,9 @@ + #include "qwaylandinputcontext_p.h" + #include "qwaylandshmbackingstore_p.h" + #include "qwaylandnativeinterface_p.h" ++#ifndef QT_NO_CLIPBOARD + #include "qwaylandclipboard_p.h" ++#endif + #include "qwaylanddnd_p.h" + #include "qwaylandwindowmanagerintegration_p.h" + #include "qwaylandscreen_p.h" +@@ -57,7 +59,9 @@ + #include <QSocketNotifier> + + #include <qpa/qplatforminputcontextfactory_p.h> ++#ifndef QT_NO_ACCESSIBILITY + #include <qpa/qplatformaccessibility.h> ++#endif + #include <qpa/qplatforminputcontext.h> + + #include "qwaylandhardwareintegration_p.h" +@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration() + , mNativeInterface(new QWaylandNativeInterface(this)) + #ifndef QT_NO_ACCESSIBILITY + , mAccessibility(new QPlatformAccessibility()) +-#else +- , mAccessibility(0) + #endif + , mClientBufferIntegrationInitialized(false) + , mServerBufferIntegrationInitialized(false) +@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration() + { + initializeInputDeviceIntegration(); + mDisplay = new QWaylandDisplay(this); ++#ifndef QT_NO_CLIPBOARD + mClipboard = new QWaylandClipboard(mDisplay); ++#endif ++#ifndef QT_NO_DRAGANDDROP + mDrag = new QWaylandDrag(mDisplay); +- ++#endif + QString icStr = QPlatformInputContextFactory::requested(); + icStr.isNull() ? mInputContext.reset(new QWaylandInputContext(mDisplay)) + : mInputContext.reset(QPlatformInputContextFactory::create(icStr)); +@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration() + + QWaylandIntegration::~QWaylandIntegration() + { ++#ifndef QT_NO_DRAGANDDROP + delete mDrag; ++#endif ++#ifndef QT_NO_CLIPBOARD + delete mClipboard; ++#endif + #ifndef QT_NO_ACCESSIBILITY + delete mAccessibility; + #endif +@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const + return mFontDb; + } + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QWaylandIntegration::clipboard() const + { + return mClipboard; + } ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *QWaylandIntegration::drag() const + { + return mDrag; + } ++#endif + + QPlatformInputContext *QWaylandIntegration::inputContext() const + { +@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const + return QPlatformIntegration::styleHint(hint); + } + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *QWaylandIntegration::accessibility() const + { + return mAccessibility; + } ++#endif + + QPlatformServices *QWaylandIntegration::services() const + { +diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h +index 987d805..b50ad95 100644 +--- a/src/client/qwaylandintegration_p.h ++++ b/src/client/qwaylandintegration_p.h +@@ -80,15 +80,21 @@ public: + + QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *drag() const Q_DECL_OVERRIDE; ++#endif + + QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; + + QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; ++#endif + + QPlatformServices *services() const Q_DECL_OVERRIDE; + +@@ -117,12 +123,18 @@ private: + void initializeInputDeviceIntegration(); + + QPlatformFontDatabase *mFontDb; ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *mClipboard; ++#endif ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *mDrag; ++#endif + QWaylandDisplay *mDisplay; + QPlatformNativeInterface *mNativeInterface; + QScopedPointer<QPlatformInputContext> mInputContext; ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *mAccessibility; ++#endif + bool mClientBufferIntegrationInitialized; + bool mServerBufferIntegrationInitialized; + bool mShellIntegrationInitialized; +-- +2.7.4 +recipes-qt/qt5/qtwayland_git.bb +1
-0@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941"Signature · 1 line
2.7.4
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 8 lines · Martin Jansa
Quoted 6 lines · Denys Dmytriyenko
From: Vesa Jääskeläinen <[email protected]>
QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,QT_NO_CLIPBOARD,QT_NO_DRAGANDDROP,QT_NO_ACCESSIBILITYandQT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland.
Quoted 5 lines
Is this still needed with:
[oe] [meta-qt5][morty][PATCH] qt5: update submodule SRCREVs to 5.7.1 releaseThe .patch doesn't apply in 5.7.1 anymore and I haven't had time to find out why.
I haven't tried it. Is 5.7.1 already in morty?
Quoted 203 lines
Quoted 200 lines
Signed-off-by Vesa Jääskeläinen <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>--- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156 +++++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patchrecipes-qt/qt5/qtwayland-native_git.bb +1
-0@@ -18,6 +18,7 @@ DEPENDS = "qtbase-native wayland-native" SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " do_configure() {recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch new file +156
-0@@ -0,0 +1,156 @@ +From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <[email protected]> +Date: Sun, 18 Sep 2016 11:51:59 +0300 +Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5 features are + disabled. + +QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL, +QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and +QT_NO_SESSIONMANAGER, these has to be taken into account when compiling +QtWayland. +--- + src/client/qwaylandintegration.cpp | 21 ++++++++++++++++++--- + src/client/qwaylandintegration_p.h | 12 ++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp +index 39fff53..481e3d6 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -39,7 +39,9 @@ + #include "qwaylandinputcontext_p.h" + #include "qwaylandshmbackingstore_p.h" + #include "qwaylandnativeinterface_p.h" ++#ifndef QT_NO_CLIPBOARD + #include "qwaylandclipboard_p.h" ++#endif + #include "qwaylanddnd_p.h" + #include "qwaylandwindowmanagerintegration_p.h" + #include "qwaylandscreen_p.h" +@@ -57,7 +59,9 @@ + #include <QSocketNotifier> + + #include <qpa/qplatforminputcontextfactory_p.h> ++#ifndef QT_NO_ACCESSIBILITY + #include <qpa/qplatformaccessibility.h> ++#endif + #include <qpa/qplatforminputcontext.h> + + #include "qwaylandhardwareintegration_p.h" +@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration() + , mNativeInterface(new QWaylandNativeInterface(this)) + #ifndef QT_NO_ACCESSIBILITY + , mAccessibility(new QPlatformAccessibility()) +-#else +- , mAccessibility(0) + #endif + , mClientBufferIntegrationInitialized(false) + , mServerBufferIntegrationInitialized(false) +@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration() + { + initializeInputDeviceIntegration(); + mDisplay = new QWaylandDisplay(this); ++#ifndef QT_NO_CLIPBOARD + mClipboard = new QWaylandClipboard(mDisplay); ++#endif ++#ifndef QT_NO_DRAGANDDROP + mDrag = new QWaylandDrag(mDisplay); +- ++#endif + QString icStr = QPlatformInputContextFactory::requested(); + icStr.isNull() ? mInputContext.reset(new QWaylandInputContext(mDisplay)) + : mInputContext.reset(QPlatformInputContextFactory::create(icStr)); +@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration() + + QWaylandIntegration::~QWaylandIntegration() + { ++#ifndef QT_NO_DRAGANDDROP + delete mDrag; ++#endif ++#ifndef QT_NO_CLIPBOARD + delete mClipboard; ++#endif + #ifndef QT_NO_ACCESSIBILITY + delete mAccessibility; + #endif +@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const + return mFontDb; + } + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QWaylandIntegration::clipboard() const + { + return mClipboard; + } ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *QWaylandIntegration::drag() const + { + return mDrag; + } ++#endif + + QPlatformInputContext *QWaylandIntegration::inputContext() const + { +@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const + return QPlatformIntegration::styleHint(hint); + } + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *QWaylandIntegration::accessibility() const + { + return mAccessibility; + } ++#endif + + QPlatformServices *QWaylandIntegration::services() const + { +diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h +index 987d805..b50ad95 100644 +--- a/src/client/qwaylandintegration_p.h ++++ b/src/client/qwaylandintegration_p.h +@@ -80,15 +80,21 @@ public: + + QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *drag() const Q_DECL_OVERRIDE; ++#endif + + QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; + + QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; ++#endif + + QPlatformServices *services() const Q_DECL_OVERRIDE; + +@@ -117,12 +123,18 @@ private: + void initializeInputDeviceIntegration(); + + QPlatformFontDatabase *mFontDb; ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *mClipboard; ++#endif ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *mDrag; ++#endif + QWaylandDisplay *mDisplay; + QPlatformNativeInterface *mNativeInterface; + QScopedPointer<QPlatformInputContext> mInputContext; ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *mAccessibility; ++#endif + bool mClientBufferIntegrationInitialized; + bool mServerBufferIntegrationInitialized; + bool mShellIntegrationInitialized; +-- +2.7.4 +recipes-qt/qt5/qtwayland_git.bb +1
-0@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941"Signature · 1 line
2.7.4Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
morty-next
Quoted 249 lines · Denys Dmytriyenko
Quoted 4 lines · Martin Jansa
Quoted 3 lines · Denys Dmytriyenko
From: Vesa Jääskeläinen <[email protected]>
QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 6 lines
Quoted 3 lines
QT_NO_CLIPBOARD,QT_NO_DRAGANDDROP,QT_NO_ACCESSIBILITYandQT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland.Is this still needed with:
[oe] [meta-qt5][morty][PATCH] qt5: update submodule SRCREVs to 5.7.1release
Quoted 3 lines
The .patch doesn't apply in 5.7.1 anymore and I haven't had time to find out why.
I haven't tried it. Is 5.7.1 already in morty?
Quoted 7 lines
Quoted 7 lines
Signed-off-by Vesa Jääskeläinen <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>--- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156+++++++++++++++++++++
Quoted 3 lines
Quoted 3 lines
recipes-qt/qt5/qtwayland_git.bb | 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
recipes-qt/qt5/
Quoted 2 lines
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwayland-native_git.bb +0
-0qtwayland-native_git.bb
Quoted 7 lines
recipes-qt/qt5/qtwayland-native_git.bb DEPENDS = "qtbase-native wayland-native" · line 20
Quoted 7 lines
index a214346..1149aa5 100644
recipes-qt/qt5/qtwayland-native_git.bb +0
-0@@ -18,6 +18,7 @@ DEPENDS = "qtbase-native wayland-native" SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch\
Quoted 1 line
recipes-qt/qt5/qtwayland-native_git.bb DEPENDS = "qtbase-native wayland-native" · line 21
Quoted 1 line
recipes-qt/qt5/qtwayland-native_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch\
Quoted 4 lines
Review
Quoted 4 lines
recipes-qt/qt5/qtwayland-native_git.bb +0
-0" do_configure() {(quoted diff) +0
-0QWaylandIntegration-if-some-Qt5-feat.patch b/recipes-qt/qt5/qtwayland/ 0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of-
Quoted 4 lines
new file mode 100644
index 0000000..d173e67recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +0
-0QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 1
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0@@ -0,0 +1,156 @@ +From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 17 00:00:002001
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 2
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 4
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+Date: Sun, 18 Sep 2016 11:51:59 +0300 +Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5features are
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 7
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+ disabled. + +QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 9
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and +QT_NO_SESSIONMANAGER, these has to be taken into account whencompiling
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 16
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0+QtWayland. +--- + src/client/qwaylandintegration.cpp | 21 ++++++++++++++++++--- + src/client/qwaylandintegration_p.h | 12 ++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
Quoted 37 lines
Quoted 37 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +37
-0+index 39fff53..481e3d6 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -39,7 +39,9 @@ + #include "qwaylandinputcontext_p.h" + #include "qwaylandshmbackingstore_p.h" + #include "qwaylandnativeinterface_p.h" ++#ifndef QT_NO_CLIPBOARD + #include "qwaylandclipboard_p.h" ++#endif + #include "qwaylanddnd_p.h" + #include "qwaylandwindowmanagerintegration_p.h" + #include "qwaylandscreen_p.h" +@@ -57,7 +59,9 @@ + #include <QSocketNotifier> + + #include <qpa/qplatforminputcontextfactory_p.h> ++#ifndef QT_NO_ACCESSIBILITY + #include <qpa/qplatformaccessibility.h> ++#endif + #include <qpa/qplatforminputcontext.h> + + #include "qwaylandhardwareintegration_p.h" +@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration() + , mNativeInterface(new QWaylandNativeInterface(this)) + #ifndef QT_NO_ACCESSIBILITY + , mAccessibility(new QPlatformAccessibility()) +-#else +- , mAccessibility(0) + #endif + , mClientBufferIntegrationInitialized(false) + , mServerBufferIntegrationInitialized(false) +@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration() + { + initializeInputDeviceIntegration(); + mDisplay = new QWaylandDisplay(this); ++#ifndef QT_NO_CLIPBOARDQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 61
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ mClipboard = new QWaylandClipboard(mDisplay); ++#endif ++#ifndef QT_NO_DRAGANDDROP + mDrag = new QWaylandDrag(mDisplay); +- ++#endif + QString icStr = QPlatformInputContextFactory::requested(); + icStr.isNull() ? mInputContext.reset(newQWaylandInputContext(mDisplay))
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 62
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+ : mInputContext.reset(
QPlatformInputContextFactory::create(icStr));Quoted 6 lines
Quoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +6
-0+@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration() + + QWaylandIntegration::~QWaylandIntegration() + { ++#ifndef QT_NO_DRAGANDDROP + delete mDrag;Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 76
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0++#endif ++#ifndef QT_NO_CLIPBOARD + delete mClipboard; ++#endif + #ifndef QT_NO_ACCESSIBILITY + delete mAccessibility; + #endif +@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase()const
Quoted 12 lines
Quoted 12 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +12
-0+ return mFontDb; + } + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QWaylandIntegration::clipboard() const + { + return mClipboard; + } ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *QWaylandIntegration::drag() constQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 96
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ { + return mDrag; + } ++#endif + + QPlatformInputContext *QWaylandIntegration::inputContext() const + { +@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHinthint) const
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ return QPlatformIntegration::styleHint(hint); + } + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *QWaylandIntegration::accessibility() constQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 109
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ { + return mAccessibility; + } ++#endif + + QPlatformServices *QWaylandIntegration::services() const + { +diff --git a/src/client/qwaylandintegration_p.h b/src/client/
qwaylandintegration_p.hQuoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 115
Quoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +6
-0+index 987d805..b50ad95 100644 +--- a/src/client/qwaylandintegration_p.h ++++ b/src/client/qwaylandintegration_p.h +@@ -80,15 +80,21 @@ public: + + QPlatformNativeInterface *nativeInterface() const
Q_DECL_OVERRIDE;Quoted 34 lines
Quoted 34 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +34
-0+ ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *drag() const Q_DECL_OVERRIDE; ++#endif + + QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; + + QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; ++#endif + + QPlatformServices *services() const Q_DECL_OVERRIDE; + +@@ -117,12 +123,18 @@ private: + void initializeInputDeviceIntegration(); + + QPlatformFontDatabase *mFontDb; ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *mClipboard; ++#endif ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *mDrag; ++#endif + QWaylandDisplay *mDisplay; + QPlatformNativeInterface *mNativeInterface; + QScopedPointer<QPlatformInputContext> mInputContext; ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *mAccessibility;Quoted 8 lines
recipes-qt/qt5/
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0++#endif + bool mClientBufferIntegrationInitialized; + bool mServerBufferIntegrationInitialized; + bool mShellIntegrationInitialized; +-- +2.7.4 +recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwayland_git.bb +0
-0qtwayland_git.bb
Quoted 7 lines
recipes-qt/qt5/qtwayland_git.bb FILES_${PN}-plugins-dbg += " \ · line 48
Quoted 7 lines
index b208961..e315924 100644
recipes-qt/qt5/qtwayland_git.bb +0
-0@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch\
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb FILES_${PN}-plugins-dbg += " \ · line 49
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch\
Quoted 9 lines
Quoted 6 lines
recipes-qt/qt5/qtwayland_git.bb +0
-1" SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" --2.7.4
--
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 1 line · Martin Jansa
morty-next
I'm getting this:
qtwebengine-5.7.1+gitAUTOINC+9cc97f0c63_b3c79e92f0-r0 do_fetch: Fetcher failure: Unable to find revision 9cc97f0c63049a8076476acc89c875c9e240abfb in branch 5.7 even from upstream
Signature · 1 line
Denys
Quoted 251 lines · Denys Dmytriyenko
Quoted 250 lines · Martin Jansa
Quoted 4 lines · Denys Dmytriyenko
Quoted 3 lines
From: Vesa Jääskeläinen <[email protected]>
QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 6 lines
Quoted 3 lines
QT_NO_CLIPBOARD,QT_NO_DRAGANDDROP,QT_NO_ACCESSIBILITYandQT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland.Is this still needed with:
[oe] [meta-qt5][morty][PATCH] qt5: update submodule SRCREVs to 5.7.1release
Quoted 3 lines
The .patch doesn't apply in 5.7.1 anymore and I haven't had time to find out why.
I haven't tried it. Is 5.7.1 already in morty?
Quoted 7 lines
Quoted 7 lines
Signed-off-by Vesa Jääskeläinen <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>--- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156+++++++++++++++++++++
Quoted 3 lines
Quoted 3 lines
recipes-qt/qt5/qtwayland_git.bb | 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
recipes-qt/qt5/
Quoted 2 lines
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwayland-native_git.bb +0
-0qtwayland-native_git.bb
Quoted 7 lines
recipes-qt/qt5/qtwayland-native_git.bb DEPENDS = "qtbase-native wayland-native" · line 20
Quoted 7 lines
index a214346..1149aa5 100644
recipes-qt/qt5/qtwayland-native_git.bb +0
-0@@ -18,6 +18,7 @@ DEPENDS = "qtbase-native wayland-native" SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch\
Quoted 1 line
recipes-qt/qt5/qtwayland-native_git.bb DEPENDS = "qtbase-native wayland-native" · line 21
Quoted 1 line
recipes-qt/qt5/qtwayland-native_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch\
Quoted 4 lines
Review
Quoted 4 lines
recipes-qt/qt5/qtwayland-native_git.bb +0
-0" do_configure() {(quoted diff) +0
-0QWaylandIntegration-if-some-Qt5-feat.patch b/recipes-qt/qt5/qtwayland/ 0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of-
Quoted 4 lines
new file mode 100644
index 0000000..d173e67recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +0
-0QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 1
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0@@ -0,0 +1,156 @@ +From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 17 00:00:002001
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 2
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 4
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+Date: Sun, 18 Sep 2016 11:51:59 +0300 +Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5features are
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 7
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+ disabled. + +QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 9
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and +QT_NO_SESSIONMANAGER, these has to be taken into account whencompiling
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 16
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0+QtWayland. +--- + src/client/qwaylandintegration.cpp | 21 ++++++++++++++++++--- + src/client/qwaylandintegration_p.h | 12 ++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
Quoted 37 lines
Quoted 37 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +37
-0+index 39fff53..481e3d6 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -39,7 +39,9 @@ + #include "qwaylandinputcontext_p.h" + #include "qwaylandshmbackingstore_p.h" + #include "qwaylandnativeinterface_p.h" ++#ifndef QT_NO_CLIPBOARD + #include "qwaylandclipboard_p.h" ++#endif + #include "qwaylanddnd_p.h" + #include "qwaylandwindowmanagerintegration_p.h" + #include "qwaylandscreen_p.h" +@@ -57,7 +59,9 @@ + #include <QSocketNotifier> + + #include <qpa/qplatforminputcontextfactory_p.h> ++#ifndef QT_NO_ACCESSIBILITY + #include <qpa/qplatformaccessibility.h> ++#endif + #include <qpa/qplatforminputcontext.h> + + #include "qwaylandhardwareintegration_p.h" +@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration() + , mNativeInterface(new QWaylandNativeInterface(this)) + #ifndef QT_NO_ACCESSIBILITY + , mAccessibility(new QPlatformAccessibility()) +-#else +- , mAccessibility(0) + #endif + , mClientBufferIntegrationInitialized(false) + , mServerBufferIntegrationInitialized(false) +@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration() + { + initializeInputDeviceIntegration(); + mDisplay = new QWaylandDisplay(this); ++#ifndef QT_NO_CLIPBOARDQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 61
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ mClipboard = new QWaylandClipboard(mDisplay); ++#endif ++#ifndef QT_NO_DRAGANDDROP + mDrag = new QWaylandDrag(mDisplay); +- ++#endif + QString icStr = QPlatformInputContextFactory::requested(); + icStr.isNull() ? mInputContext.reset(newQWaylandInputContext(mDisplay))
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 62
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+ : mInputContext.reset(
QPlatformInputContextFactory::create(icStr));Quoted 6 lines
Quoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +6
-0+@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration() + + QWaylandIntegration::~QWaylandIntegration() + { ++#ifndef QT_NO_DRAGANDDROP + delete mDrag;Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 76
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0++#endif ++#ifndef QT_NO_CLIPBOARD + delete mClipboard; ++#endif + #ifndef QT_NO_ACCESSIBILITY + delete mAccessibility; + #endif +@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase()const
Quoted 12 lines
Quoted 12 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +12
-0+ return mFontDb; + } + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QWaylandIntegration::clipboard() const + { + return mClipboard; + } ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *QWaylandIntegration::drag() constQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 96
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ { + return mDrag; + } ++#endif + + QPlatformInputContext *QWaylandIntegration::inputContext() const + { +@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHinthint) const
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ return QPlatformIntegration::styleHint(hint); + } + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *QWaylandIntegration::accessibility() constQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 109
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ { + return mAccessibility; + } ++#endif + + QPlatformServices *QWaylandIntegration::services() const + { +diff --git a/src/client/qwaylandintegration_p.h b/src/client/
qwaylandintegration_p.hQuoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 115
Quoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +6
-0+index 987d805..b50ad95 100644 +--- a/src/client/qwaylandintegration_p.h ++++ b/src/client/qwaylandintegration_p.h +@@ -80,15 +80,21 @@ public: + + QPlatformNativeInterface *nativeInterface() const
Q_DECL_OVERRIDE;Quoted 34 lines
Quoted 34 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +34
-0+ ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *drag() const Q_DECL_OVERRIDE; ++#endif + + QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; + + QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; ++#endif + + QPlatformServices *services() const Q_DECL_OVERRIDE; + +@@ -117,12 +123,18 @@ private: + void initializeInputDeviceIntegration(); + + QPlatformFontDatabase *mFontDb; ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *mClipboard; ++#endif ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *mDrag; ++#endif + QWaylandDisplay *mDisplay; + QPlatformNativeInterface *mNativeInterface; + QScopedPointer<QPlatformInputContext> mInputContext; ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *mAccessibility;Quoted 8 lines
recipes-qt/qt5/
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0++#endif + bool mClientBufferIntegrationInitialized; + bool mServerBufferIntegrationInitialized; + bool mShellIntegrationInitialized; +-- +2.7.4 +recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwayland_git.bb +0
-0qtwayland_git.bb
Quoted 7 lines
recipes-qt/qt5/qtwayland_git.bb FILES_${PN}-plugins-dbg += " \ · line 48
Quoted 7 lines
index b208961..e315924 100644
recipes-qt/qt5/qtwayland_git.bb +0
-0@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch\
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb FILES_${PN}-plugins-dbg += " \ · line 49
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch\
Quoted 9 lines
Quoted 6 lines
recipes-qt/qt5/qtwayland_git.bb +0
-1" SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" --2.7.4
--
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 6 lines · Denys Dmytriyenko
Quoted 1 line · Martin Jansa
morty-next
I'm getting this:
qtwebengine-5.7.1+gitAUTOINC+9cc97f0c63_b3c79e92f0-r0
do_fetch: Fetcher failure: Unable to find revision9cc97f0c63049a8076476acc89c875c9e240abfbin branch 5.7 even from upstream
But the good news is that qtwayland no longer seem to require the patch in question for QWaylandIntegration!
Signature · 1 line
Denys
Quoted 256 lines
Quoted 251 lines · Denys Dmytriyenko
Quoted 250 lines · Martin Jansa
Quoted 4 lines · Denys Dmytriyenko
Quoted 3 lines
From: Vesa Jääskeläinen <[email protected]>
QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 6 lines
Quoted 3 lines
QT_NO_CLIPBOARD,QT_NO_DRAGANDDROP,QT_NO_ACCESSIBILITYandQT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland.Is this still needed with:
[oe] [meta-qt5][morty][PATCH] qt5: update submodule SRCREVs to 5.7.1release
Quoted 3 lines
The .patch doesn't apply in 5.7.1 anymore and I haven't had time to find out why.
I haven't tried it. Is 5.7.1 already in morty?
Quoted 7 lines
Quoted 7 lines
Signed-off-by Vesa Jääskeläinen <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>--- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156+++++++++++++++++++++
Quoted 3 lines
Quoted 3 lines
recipes-qt/qt5/qtwayland_git.bb | 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
recipes-qt/qt5/
Quoted 2 lines
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwayland-native_git.bb +0
-0qtwayland-native_git.bb
Quoted 7 lines
recipes-qt/qt5/qtwayland-native_git.bb DEPENDS = "qtbase-native wayland-native" · line 20
Quoted 7 lines
index a214346..1149aa5 100644
recipes-qt/qt5/qtwayland-native_git.bb +0
-0@@ -18,6 +18,7 @@ DEPENDS = "qtbase-native wayland-native" SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch\
Quoted 1 line
recipes-qt/qt5/qtwayland-native_git.bb DEPENDS = "qtbase-native wayland-native" · line 21
Quoted 1 line
recipes-qt/qt5/qtwayland-native_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch\
Quoted 4 lines
Review
Quoted 4 lines
recipes-qt/qt5/qtwayland-native_git.bb +0
-0" do_configure() {(quoted diff) +0
-0QWaylandIntegration-if-some-Qt5-feat.patch b/recipes-qt/qt5/qtwayland/ 0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of-
Quoted 4 lines
new file mode 100644
index 0000000..d173e67recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +0
-0QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 1
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0@@ -0,0 +1,156 @@ +From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 17 00:00:002001
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 2
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 4
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+Date: Sun, 18 Sep 2016 11:51:59 +0300 +Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5features are
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 7
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+ disabled. + +QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 9
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and +QT_NO_SESSIONMANAGER, these has to be taken into account whencompiling
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 16
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0+QtWayland. +--- + src/client/qwaylandintegration.cpp | 21 ++++++++++++++++++--- + src/client/qwaylandintegration_p.h | 12 ++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
Quoted 37 lines
Quoted 37 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +37
-0+index 39fff53..481e3d6 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -39,7 +39,9 @@ + #include "qwaylandinputcontext_p.h" + #include "qwaylandshmbackingstore_p.h" + #include "qwaylandnativeinterface_p.h" ++#ifndef QT_NO_CLIPBOARD + #include "qwaylandclipboard_p.h" ++#endif + #include "qwaylanddnd_p.h" + #include "qwaylandwindowmanagerintegration_p.h" + #include "qwaylandscreen_p.h" +@@ -57,7 +59,9 @@ + #include <QSocketNotifier> + + #include <qpa/qplatforminputcontextfactory_p.h> ++#ifndef QT_NO_ACCESSIBILITY + #include <qpa/qplatformaccessibility.h> ++#endif + #include <qpa/qplatforminputcontext.h> + + #include "qwaylandhardwareintegration_p.h" +@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration() + , mNativeInterface(new QWaylandNativeInterface(this)) + #ifndef QT_NO_ACCESSIBILITY + , mAccessibility(new QPlatformAccessibility()) +-#else +- , mAccessibility(0) + #endif + , mClientBufferIntegrationInitialized(false) + , mServerBufferIntegrationInitialized(false) +@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration() + { + initializeInputDeviceIntegration(); + mDisplay = new QWaylandDisplay(this); ++#ifndef QT_NO_CLIPBOARDQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 61
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ mClipboard = new QWaylandClipboard(mDisplay); ++#endif ++#ifndef QT_NO_DRAGANDDROP + mDrag = new QWaylandDrag(mDisplay); +- ++#endif + QString icStr = QPlatformInputContextFactory::requested(); + icStr.isNull() ? mInputContext.reset(newQWaylandInputContext(mDisplay))
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 62
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+ : mInputContext.reset(
QPlatformInputContextFactory::create(icStr));Quoted 6 lines
Quoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +6
-0+@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration() + + QWaylandIntegration::~QWaylandIntegration() + { ++#ifndef QT_NO_DRAGANDDROP + delete mDrag;Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 76
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0++#endif ++#ifndef QT_NO_CLIPBOARD + delete mClipboard; ++#endif + #ifndef QT_NO_ACCESSIBILITY + delete mAccessibility; + #endif +@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase()const
Quoted 12 lines
Quoted 12 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +12
-0+ return mFontDb; + } + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QWaylandIntegration::clipboard() const + { + return mClipboard; + } ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *QWaylandIntegration::drag() constQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 96
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ { + return mDrag; + } ++#endif + + QPlatformInputContext *QWaylandIntegration::inputContext() const + { +@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHinthint) const
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ return QPlatformIntegration::styleHint(hint); + } + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *QWaylandIntegration::accessibility() constQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 109
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ { + return mAccessibility; + } ++#endif + + QPlatformServices *QWaylandIntegration::services() const + { +diff --git a/src/client/qwaylandintegration_p.h b/src/client/
qwaylandintegration_p.hQuoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 115
Quoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +6
-0+index 987d805..b50ad95 100644 +--- a/src/client/qwaylandintegration_p.h ++++ b/src/client/qwaylandintegration_p.h +@@ -80,15 +80,21 @@ public: + + QPlatformNativeInterface *nativeInterface() const
Q_DECL_OVERRIDE;Quoted 34 lines
Quoted 34 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +34
-0+ ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *drag() const Q_DECL_OVERRIDE; ++#endif + + QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; + + QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; ++#endif + + QPlatformServices *services() const Q_DECL_OVERRIDE; + +@@ -117,12 +123,18 @@ private: + void initializeInputDeviceIntegration(); + + QPlatformFontDatabase *mFontDb; ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *mClipboard; ++#endif ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *mDrag; ++#endif + QWaylandDisplay *mDisplay; + QPlatformNativeInterface *mNativeInterface; + QScopedPointer<QPlatformInputContext> mInputContext; ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *mAccessibility;Quoted 8 lines
recipes-qt/qt5/
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0++#endif + bool mClientBufferIntegrationInitialized; + bool mServerBufferIntegrationInitialized; + bool mShellIntegrationInitialized; +-- +2.7.4 +recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwayland_git.bb +0
-0qtwayland_git.bb
Quoted 7 lines
recipes-qt/qt5/qtwayland_git.bb FILES_${PN}-plugins-dbg += " \ · line 48
Quoted 7 lines
index b208961..e315924 100644
recipes-qt/qt5/qtwayland_git.bb +0
-0@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch\
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb FILES_${PN}-plugins-dbg += " \ · line 49
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch\
Quoted 9 lines
Quoted 6 lines
recipes-qt/qt5/qtwayland_git.bb +0
-1" SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" --2.7.4
--
Martin 'JaMa' Jansa jabber: [email protected]Signature · 4 lines
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 10 lines · Denys Dmytriyenko
Quoted 6 lines · Denys Dmytriyenko
Quoted 1 line · Martin Jansa
morty-next
I'm getting this:
qtwebengine-5.7.1+gitAUTOINC+9cc97f0c63_b3c79e92f0-r0
do_fetch: Fetcher failure: Unable to find revision9cc97f0c63049a8076476acc89c875c9e240abfbin branch 5.7 even from upstreamBut the good news is that qtwayland no longer seem to require the patch in question for QWaylandIntegration!
Ah, Never mind - just noticed that the patch was already merged before 5.7.1.
I'll try fixing qtwebengine commit...
Quoted 261 lines
Quoted 256 lines
Quoted 251 lines · Denys Dmytriyenko
Quoted 250 lines · Martin Jansa
Quoted 4 lines · Denys Dmytriyenko
Quoted 3 lines
From: Vesa Jääskeläinen <[email protected]>
QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 6 lines
Quoted 3 lines
QT_NO_CLIPBOARD,QT_NO_DRAGANDDROP,QT_NO_ACCESSIBILITYandQT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland.Is this still needed with:
[oe] [meta-qt5][morty][PATCH] qt5: update submodule SRCREVs to 5.7.1release
Quoted 3 lines
The .patch doesn't apply in 5.7.1 anymore and I haven't had time to find out why.
I haven't tried it. Is 5.7.1 already in morty?
Quoted 7 lines
Quoted 7 lines
Signed-off-by Vesa Jääskeläinen <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>--- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156+++++++++++++++++++++
Quoted 3 lines
Quoted 3 lines
recipes-qt/qt5/qtwayland_git.bb | 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
recipes-qt/qt5/
Quoted 2 lines
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwayland-native_git.bb +0
-0qtwayland-native_git.bb
Quoted 7 lines
recipes-qt/qt5/qtwayland-native_git.bb DEPENDS = "qtbase-native wayland-native" · line 20
Quoted 7 lines
index a214346..1149aa5 100644
recipes-qt/qt5/qtwayland-native_git.bb +0
-0@@ -18,6 +18,7 @@ DEPENDS = "qtbase-native wayland-native" SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch\
Quoted 1 line
recipes-qt/qt5/qtwayland-native_git.bb DEPENDS = "qtbase-native wayland-native" · line 21
Quoted 1 line
recipes-qt/qt5/qtwayland-native_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch\
Quoted 4 lines
Review
Quoted 4 lines
recipes-qt/qt5/qtwayland-native_git.bb +0
-0" do_configure() {(quoted diff) +0
-0QWaylandIntegration-if-some-Qt5-feat.patch b/recipes-qt/qt5/qtwayland/ 0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of-
Quoted 4 lines
new file mode 100644
index 0000000..d173e67recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +0
-0QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 1
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0@@ -0,0 +1,156 @@ +From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 17 00:00:002001
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 2
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 4
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+Date: Sun, 18 Sep 2016 11:51:59 +0300 +Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5features are
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 7
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+ disabled. + +QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 9
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and +QT_NO_SESSIONMANAGER, these has to be taken into account whencompiling
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 16
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0+QtWayland. +--- + src/client/qwaylandintegration.cpp | 21 ++++++++++++++++++--- + src/client/qwaylandintegration_p.h | 12 ++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
Quoted 37 lines
Quoted 37 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +37
-0+index 39fff53..481e3d6 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -39,7 +39,9 @@ + #include "qwaylandinputcontext_p.h" + #include "qwaylandshmbackingstore_p.h" + #include "qwaylandnativeinterface_p.h" ++#ifndef QT_NO_CLIPBOARD + #include "qwaylandclipboard_p.h" ++#endif + #include "qwaylanddnd_p.h" + #include "qwaylandwindowmanagerintegration_p.h" + #include "qwaylandscreen_p.h" +@@ -57,7 +59,9 @@ + #include <QSocketNotifier> + + #include <qpa/qplatforminputcontextfactory_p.h> ++#ifndef QT_NO_ACCESSIBILITY + #include <qpa/qplatformaccessibility.h> ++#endif + #include <qpa/qplatforminputcontext.h> + + #include "qwaylandhardwareintegration_p.h" +@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration() + , mNativeInterface(new QWaylandNativeInterface(this)) + #ifndef QT_NO_ACCESSIBILITY + , mAccessibility(new QPlatformAccessibility()) +-#else +- , mAccessibility(0) + #endif + , mClientBufferIntegrationInitialized(false) + , mServerBufferIntegrationInitialized(false) +@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration() + { + initializeInputDeviceIntegration(); + mDisplay = new QWaylandDisplay(this); ++#ifndef QT_NO_CLIPBOARDQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 61
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ mClipboard = new QWaylandClipboard(mDisplay); ++#endif ++#ifndef QT_NO_DRAGANDDROP + mDrag = new QWaylandDrag(mDisplay); +- ++#endif + QString icStr = QPlatformInputContextFactory::requested(); + icStr.isNull() ? mInputContext.reset(newQWaylandInputContext(mDisplay))
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 62
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+ : mInputContext.reset(
QPlatformInputContextFactory::create(icStr));Quoted 6 lines
Quoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +6
-0+@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration() + + QWaylandIntegration::~QWaylandIntegration() + { ++#ifndef QT_NO_DRAGANDDROP + delete mDrag;Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 76
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0++#endif ++#ifndef QT_NO_CLIPBOARD + delete mClipboard; ++#endif + #ifndef QT_NO_ACCESSIBILITY + delete mAccessibility; + #endif +@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase()const
Quoted 12 lines
Quoted 12 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +12
-0+ return mFontDb; + } + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QWaylandIntegration::clipboard() const + { + return mClipboard; + } ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *QWaylandIntegration::drag() constQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 96
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ { + return mDrag; + } ++#endif + + QPlatformInputContext *QWaylandIntegration::inputContext() const + { +@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHinthint) const
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ return QPlatformIntegration::styleHint(hint); + } + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *QWaylandIntegration::accessibility() constQuoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 109
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ { + return mAccessibility; + } ++#endif + + QPlatformServices *QWaylandIntegration::services() const + { +diff --git a/src/client/qwaylandintegration_p.h b/src/client/
qwaylandintegration_p.hQuoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 115
Quoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +6
-0+index 987d805..b50ad95 100644 +--- a/src/client/qwaylandintegration_p.h ++++ b/src/client/qwaylandintegration_p.h +@@ -80,15 +80,21 @@ public: + + QPlatformNativeInterface *nativeInterface() const
Q_DECL_OVERRIDE;Quoted 34 lines
Quoted 34 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +34
-0+ ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *drag() const Q_DECL_OVERRIDE; ++#endif + + QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; + + QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; ++#endif + + QPlatformServices *services() const Q_DECL_OVERRIDE; + +@@ -117,12 +123,18 @@ private: + void initializeInputDeviceIntegration(); + + QPlatformFontDatabase *mFontDb; ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *mClipboard; ++#endif ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *mDrag; ++#endif + QWaylandDisplay *mDisplay; + QPlatformNativeInterface *mNativeInterface; + QScopedPointer<QPlatformInputContext> mInputContext; ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *mAccessibility;Quoted 8 lines
recipes-qt/qt5/
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0++#endif + bool mClientBufferIntegrationInitialized; + bool mServerBufferIntegrationInitialized; + bool mShellIntegrationInitialized; +-- +2.7.4 +recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwayland_git.bb +0
-0qtwayland_git.bb
Quoted 7 lines
recipes-qt/qt5/qtwayland_git.bb FILES_${PN}-plugins-dbg += " \ · line 48
Quoted 7 lines
index b208961..e315924 100644
recipes-qt/qt5/qtwayland_git.bb +0
-0@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch\
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb FILES_${PN}-plugins-dbg += " \ · line 49
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch\
Quoted 9 lines
Quoted 6 lines
recipes-qt/qt5/qtwayland_git.bb +0
-1" SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" --2.7.4
--
Martin 'JaMa' Jansa jabber: [email protected]Signature · 4 lines
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-develSignature · 4 lines
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Was it really merged?
Then why was it updated here instead of removing it completely?
https://patchwork.openembedded.org/patch/135662/
Quoted 308 lines · Denys Dmytriyenko
Quoted 7 lines · Denys Dmytriyenko
Quoted 6 lines · Denys Dmytriyenko
Quoted 1 line · Martin Jansa
morty-next
I'm getting this:
qtwebengine-5.7.1+gitAUTOINC+9cc97f0c63_b3c79e92f0-r0
do_fetch:Fetcher failure: Unable to find revision
9cc97f0c63049a8076476acc89c875c9e240abfbin branch 5.7 even from upstreamQuoted 2 lines
But the good news is that qtwayland no longer seem to require the patch
in
Quoted 1 line
question for QWaylandIntegration!
Ah, Never mind - just noticed that the patch was already merged before 5.7.1.
I'll try fixing qtwebengine commit...
Quoted 1 line
Quoted 1 line
Quoted 1 line
On Wed, Jan 11, 2017 at 1:27 AM, Denys Dmytriyenko <[email protected]>
Quoted 3 lines · wrote:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines · Martin Jansa
Quoted 1 line
On Thu, Dec 22, 2016 at 05:14:49PM -0500, Denys Dmytriyenko
Quoted 6 lines · wrote:
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
From: Vesa Jääskeläinen <[email protected]>
QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 2 lines
Quoted 2 lines
QT_NO_CLIPBOARD,QT_NO_DRAGANDDROP,QT_NO_ACCESSIBILITYandQT_NO_SESSIONMANAGER, these has to be taken into account whencompiling
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
QtWayland.
Is this still needed with:
[oe] [meta-qt5][morty][PATCH] qt5: update submodule SRCREVs to5.7.1
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
release
Quoted 2 lines
The .patch doesn't apply in 5.7.1 anymore and I haven't had time
to find
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 1 line
out why.
I haven't tried it. Is 5.7.1 already in morty?
Quoted 7 lines
Quoted 7 lines
Signed-off-by Vesa Jääskeläinen <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>--- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
+++++++++++++++++++++
Quoted 3 lines
Quoted 3 lines
recipes-qt/qt5/qtwayland_git.bb | 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-0b/recipes-qt/qt5/
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
qtwayland-native_git.bb
Quoted 7 lines
recipes-qt/qt5/qtwayland-native_git.bb DEPENDS = "qtbase-native wayland-native" · line 20
Quoted 7 lines
index a214346..1149aa5 100644
recipes-qt/qt5/qtwayland-native_git.bb +0
-0@@ -18,6 +18,7 @@ DEPENDS = "qtbase-native wayland-native" SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
\
Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland-native_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
\
Quoted 4 lines
Review
Quoted 4 lines
recipes-qt/qt5/qtwayland-native_git.bb +0
-0" do_configure() {(quoted diff) +0
-0QWaylandIntegration-if-some-Qt5-feat.patch
b/recipes-qt/qt5/qtwayland/
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of-
Quoted 4 lines
new file mode 100644
index 0000000..d173e67recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +0
-0QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 1
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0@@ -0,0 +1,156 @@ +From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 1700:00:00
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
2001
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 2
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 4
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+Date: Sun, 18 Sep 2016 11:51:59 +0300 +Subject: [PATCH] Fix building of QWaylandIntegration if someQt5
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
features are
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 7
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+ disabled. + +QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 9
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and +QT_NO_SESSIONMANAGER, these has to be taken into account whencompiling
Quoted 3 lines
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+QtWayland. +--- + src/client/qwaylandintegration.cpp | 21++++++++++++++++++---
Quoted 21 lines
Quoted 21 lines
Quoted 21 lines
Quoted 21 lines
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 16
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +4
-0+ src/client/qwaylandintegration_p.h | 12 ++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
Quoted 16 lines
Quoted 16 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +16
-0+index 39fff53..481e3d6 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -39,7 +39,9 @@ + #include "qwaylandinputcontext_p.h" + #include "qwaylandshmbackingstore_p.h" + #include "qwaylandnativeinterface_p.h" ++#ifndef QT_NO_CLIPBOARD + #include "qwaylandclipboard_p.h" ++#endif + #include "qwaylanddnd_p.h" + #include "qwaylandwindowmanagerintegration_p.h" + #include "qwaylandscreen_p.h" +@@ -57,7 +59,9 @@ + #include <QSocketNotifier> +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 40
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ #include <qpa/qplatforminputcontextfactory_p.h> ++#ifndef QT_NO_ACCESSIBILITY + #include <qpa/qplatformaccessibility.h> ++#endif + #include <qpa/qplatforminputcontext.h> + + #include "qwaylandhardwareintegration_p.h" +@@ -117,8 +121,6 @@ QWaylandIntegration::
QWaylandIntegration()Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 49
Quoted 9 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +9
-0+ , mNativeInterface(new QWaylandNativeInterface(this)) + #ifndef QT_NO_ACCESSIBILITY + , mAccessibility(new QPlatformAccessibility()) +-#else +- , mAccessibility(0) + #endif + , mClientBufferIntegrationInitialized(false) + , mServerBufferIntegrationInitialized(false) +@@ -126,9 +128,12 @@ QWaylandIntegration::
QWaylandIntegration()Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 60
Quoted 11 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +11
-0+ { + initializeInputDeviceIntegration(); + mDisplay = new QWaylandDisplay(this); ++#ifndef QT_NO_CLIPBOARD + mClipboard = new QWaylandClipboard(mDisplay); ++#endif ++#ifndef QT_NO_DRAGANDDROP + mDrag = new QWaylandDrag(mDisplay); +- ++#endif + QString icStr = QPlatformInputContextFactory::
requested();Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 61
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+ icStr.isNull() ? mInputContext.reset(newQWaylandInputContext(mDisplay))
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 62
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+ : mInputContext.reset(
QPlatformInputContextFactory::create(icStr));Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+@@ -136,8 +141,12 @@ QWaylandIntegration::
QWaylandIntegration()Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ + QWaylandIntegration::~QWaylandIntegration() + { ++#ifndef QT_NO_DRAGANDDROP + delete mDrag;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 76
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0++#endif ++#ifndef QT_NO_CLIPBOARD + delete mClipboard; ++#endif + #ifndef QT_NO_ACCESSIBILITY + delete mAccessibility; + #endif +@@ -213,15 +222,19 @@ QPlatformFontDatabase
*QWaylandIntegration::fontDatabase()Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
const
Quoted 10 lines
Quoted 10 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +10
-0+ return mFontDb; + } + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QWaylandIntegration::clipboard() const + { + return mClipboard; + } ++#endif +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 94
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *QWaylandIntegration::drag() const + { + return mDrag; + } ++#endif + + QPlatformInputContext *QWaylandIntegration::inputContext()const
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 96
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+ { +@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
hint) const
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ return QPlatformIntegration::styleHint(hint); + } + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *QWaylandIntegration::accessibility()const
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 109
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ { + return mAccessibility; + } ++#endif + + QPlatformServices *QWaylandIntegration::services() const + { +diff --git a/src/client/qwaylandintegration_p.h b/src/client/
qwaylandintegration_p.hQuoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 115
Quoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +6
-0+index 987d805..b50ad95 100644 +--- a/src/client/qwaylandintegration_p.h ++++ b/src/client/qwaylandintegration_p.h +@@ -80,15 +80,21 @@ public: + + QPlatformNativeInterface *nativeInterface() const
Q_DECL_OVERRIDE;Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 125
Quoted 10 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +10
-0+ ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *drag() const Q_DECL_OVERRIDE; ++#endif + + QPlatformInputContext *inputContext() const
Q_DECL_OVERRIDE;Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 130
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ + QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *accessibility() const
Q_DECL_OVERRIDE;Quoted 28 lines
Quoted 28 lines
Quoted 28 lines
Quoted 28 lines
Quoted 19 lines
Quoted 19 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +19
-0++#endif + + QPlatformServices *services() const Q_DECL_OVERRIDE; + +@@ -117,12 +123,18 @@ private: + void initializeInputDeviceIntegration(); + + QPlatformFontDatabase *mFontDb; ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *mClipboard; ++#endif ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *mDrag; ++#endif + QWaylandDisplay *mDisplay; + QPlatformNativeInterface *mNativeInterface; + QScopedPointer<QPlatformInputContext> mInputContext; ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *mAccessibility;Quoted 8 lines
recipes-qt/qt5/
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0++#endif + bool mClientBufferIntegrationInitialized; + bool mServerBufferIntegrationInitialized; + bool mShellIntegrationInitialized; +-- +2.7.4 +recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwayland_git.bb +0
-0qtwayland_git.bb
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
recipes-qt/qt5/qtwayland_git.bb FILES_${PN}-plugins-dbg += " \ · line 48
Quoted 7 lines
index b208961..e315924 100644
recipes-qt/qt5/qtwayland_git.bb +0
-0@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
\
Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 23 lines
Quoted 13 lines
Quoted 8 lines
Quoted 8 lines
\
Quoted 7 lines
Quoted 6 lines
recipes-qt/qt5/qtwayland_git.bb +0
-1" SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" --2.7.4
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
--
Martin 'JaMa' Jansa jabber: [email protected]Quoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Not sure about that, here's the output of git log -p qtwayland_git.bb from morty-next and seems to build fine:
commit 17abfb37eb59c7b78abe80aa45072ce0ed63491d
Author: Mikko Gronoff <[email protected]> Date: Wed Dec 28 08:06:54 2016 +0200
qt5: update submodule SRCREVs to 5.7.1 release
* squashed with https://patchwork.openembedded.org/patch/135662/
qtwayland: update patch to apply with Qt 5.7.1
Update 0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch to apply on Qt 5.7.1 sources.
recipes-qt/qt5/qtwayland_git.bb +1 -1
@@ -49,4 +49,4 @@ SRC_URI += " \ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " -SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" +SRCREV = "4b23163fb64a5a8d05320dd006962cf2bcefcd84"
commit 5c5b6b3f30d7eae730b77d6701b4410416172951
Author: Vesa Jääskeläinen <[email protected]> Date: Thu Dec 22 17:14:49 2016 -0500
qtwayland: Fix building of QWaylandIntegration if some Qt5 features are
disabled.
QPlatformIntegration's interface methods are disabled based onQT_NO_OPENGL,
QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and QT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland.
recipes-qt/qt5/qtwayland_git.bb +1 -0
@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941"
Quoted 316 lines · Martin Jansa
Was it really merged?
Then why was it updated here instead of removing it completely?
https://patchwork.openembedded.org/patch/135662/
Quoted 308 lines · Denys Dmytriyenko
Quoted 7 lines · Denys Dmytriyenko
Quoted 6 lines · Denys Dmytriyenko
Quoted 1 line · Martin Jansa
morty-next
I'm getting this:
qtwebengine-5.7.1+gitAUTOINC+9cc97f0c63_b3c79e92f0-r0
do_fetch:Fetcher failure: Unable to find revision
9cc97f0c63049a8076476acc89c875c9e240abfbin branch 5.7 even from upstreamQuoted 2 lines
But the good news is that qtwayland no longer seem to require the patch
in
Quoted 1 line
question for QWaylandIntegration!
Ah, Never mind - just noticed that the patch was already merged before 5.7.1.
I'll try fixing qtwebengine commit...
Quoted 1 line
Quoted 1 line
Quoted 1 line
On Wed, Jan 11, 2017 at 1:27 AM, Denys Dmytriyenko <[email protected]>
Quoted 3 lines · wrote:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines · Martin Jansa
Quoted 1 line
On Thu, Dec 22, 2016 at 05:14:49PM -0500, Denys Dmytriyenko
Quoted 6 lines · wrote:
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
From: Vesa Jääskeläinen <[email protected]>
QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 2 lines
Quoted 2 lines
QT_NO_CLIPBOARD,QT_NO_DRAGANDDROP,QT_NO_ACCESSIBILITYandQT_NO_SESSIONMANAGER, these has to be taken into account whencompiling
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
QtWayland.
Is this still needed with:
[oe] [meta-qt5][morty][PATCH] qt5: update submodule SRCREVs to5.7.1
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
release
Quoted 2 lines
The .patch doesn't apply in 5.7.1 anymore and I haven't had time
to find
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 1 line
out why.
I haven't tried it. Is 5.7.1 already in morty?
Quoted 7 lines
Quoted 7 lines
Signed-off-by Vesa Jääskeläinen <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>--- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
+++++++++++++++++++++
Quoted 3 lines
Quoted 3 lines
recipes-qt/qt5/qtwayland_git.bb | 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-0b/recipes-qt/qt5/
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
qtwayland-native_git.bb
Quoted 7 lines
recipes-qt/qt5/qtwayland-native_git.bb DEPENDS = "qtbase-native wayland-native" · line 20
Quoted 7 lines
index a214346..1149aa5 100644
recipes-qt/qt5/qtwayland-native_git.bb +0
-0@@ -18,6 +18,7 @@ DEPENDS = "qtbase-native wayland-native" SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
\
Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland-native_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
\
Quoted 4 lines
Review
Quoted 4 lines
recipes-qt/qt5/qtwayland-native_git.bb +0
-0" do_configure() {(quoted diff) +0
-0QWaylandIntegration-if-some-Qt5-feat.patch
b/recipes-qt/qt5/qtwayland/
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of-
Quoted 4 lines
new file mode 100644
index 0000000..d173e67recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +0
-0QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 1
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0@@ -0,0 +1,156 @@ +From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 1700:00:00
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
2001
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 2
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 4
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+Date: Sun, 18 Sep 2016 11:51:59 +0300 +Subject: [PATCH] Fix building of QWaylandIntegration if someQt5
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
features are
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 7
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+ disabled. + +QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 9
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and +QT_NO_SESSIONMANAGER, these has to be taken into account whencompiling
Quoted 3 lines
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+QtWayland. +--- + src/client/qwaylandintegration.cpp | 21++++++++++++++++++---
Quoted 21 lines
Quoted 21 lines
Quoted 21 lines
Quoted 21 lines
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 16
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +4
-0+ src/client/qwaylandintegration_p.h | 12 ++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
Quoted 16 lines
Quoted 16 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +16
-0+index 39fff53..481e3d6 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -39,7 +39,9 @@ + #include "qwaylandinputcontext_p.h" + #include "qwaylandshmbackingstore_p.h" + #include "qwaylandnativeinterface_p.h" ++#ifndef QT_NO_CLIPBOARD + #include "qwaylandclipboard_p.h" ++#endif + #include "qwaylanddnd_p.h" + #include "qwaylandwindowmanagerintegration_p.h" + #include "qwaylandscreen_p.h" +@@ -57,7 +59,9 @@ + #include <QSocketNotifier> +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 40
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ #include <qpa/qplatforminputcontextfactory_p.h> ++#ifndef QT_NO_ACCESSIBILITY + #include <qpa/qplatformaccessibility.h> ++#endif + #include <qpa/qplatforminputcontext.h> + + #include "qwaylandhardwareintegration_p.h" +@@ -117,8 +121,6 @@ QWaylandIntegration::
QWaylandIntegration()Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 49
Quoted 9 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +9
-0+ , mNativeInterface(new QWaylandNativeInterface(this)) + #ifndef QT_NO_ACCESSIBILITY + , mAccessibility(new QPlatformAccessibility()) +-#else +- , mAccessibility(0) + #endif + , mClientBufferIntegrationInitialized(false) + , mServerBufferIntegrationInitialized(false) +@@ -126,9 +128,12 @@ QWaylandIntegration::
QWaylandIntegration()Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 60
Quoted 11 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +11
-0+ { + initializeInputDeviceIntegration(); + mDisplay = new QWaylandDisplay(this); ++#ifndef QT_NO_CLIPBOARD + mClipboard = new QWaylandClipboard(mDisplay); ++#endif ++#ifndef QT_NO_DRAGANDDROP + mDrag = new QWaylandDrag(mDisplay); +- ++#endif + QString icStr = QPlatformInputContextFactory::
requested();Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 61
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+ icStr.isNull() ? mInputContext.reset(newQWaylandInputContext(mDisplay))
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 62
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+ : mInputContext.reset(
QPlatformInputContextFactory::create(icStr));Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+@@ -136,8 +141,12 @@ QWaylandIntegration::
QWaylandIntegration()Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ + QWaylandIntegration::~QWaylandIntegration() + { ++#ifndef QT_NO_DRAGANDDROP + delete mDrag;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 76
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0++#endif ++#ifndef QT_NO_CLIPBOARD + delete mClipboard; ++#endif + #ifndef QT_NO_ACCESSIBILITY + delete mAccessibility; + #endif +@@ -213,15 +222,19 @@ QPlatformFontDatabase
*QWaylandIntegration::fontDatabase()Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
const
Quoted 10 lines
Quoted 10 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +10
-0+ return mFontDb; + } + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QWaylandIntegration::clipboard() const + { + return mClipboard; + } ++#endif +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 94
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *QWaylandIntegration::drag() const + { + return mDrag; + } ++#endif + + QPlatformInputContext *QWaylandIntegration::inputContext()const
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 96
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+ { +@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
hint) const
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ return QPlatformIntegration::styleHint(hint); + } + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *QWaylandIntegration::accessibility()const
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 109
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ { + return mAccessibility; + } ++#endif + + QPlatformServices *QWaylandIntegration::services() const + { +diff --git a/src/client/qwaylandintegration_p.h b/src/client/
qwaylandintegration_p.hQuoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 115
Quoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +6
-0+index 987d805..b50ad95 100644 +--- a/src/client/qwaylandintegration_p.h ++++ b/src/client/qwaylandintegration_p.h +@@ -80,15 +80,21 @@ public: + + QPlatformNativeInterface *nativeInterface() const
Q_DECL_OVERRIDE;Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 125
Quoted 10 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +10
-0+ ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *drag() const Q_DECL_OVERRIDE; ++#endif + + QPlatformInputContext *inputContext() const
Q_DECL_OVERRIDE;Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 130
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ + QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *accessibility() const
Q_DECL_OVERRIDE;Quoted 28 lines
Quoted 28 lines
Quoted 28 lines
Quoted 28 lines
Quoted 19 lines
Quoted 19 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +19
-0++#endif + + QPlatformServices *services() const Q_DECL_OVERRIDE; + +@@ -117,12 +123,18 @@ private: + void initializeInputDeviceIntegration(); + + QPlatformFontDatabase *mFontDb; ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *mClipboard; ++#endif ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *mDrag; ++#endif + QWaylandDisplay *mDisplay; + QPlatformNativeInterface *mNativeInterface; + QScopedPointer<QPlatformInputContext> mInputContext; ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *mAccessibility;Quoted 8 lines
recipes-qt/qt5/
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0++#endif + bool mClientBufferIntegrationInitialized; + bool mServerBufferIntegrationInitialized; + bool mShellIntegrationInitialized; +-- +2.7.4 +recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwayland_git.bb +0
-0qtwayland_git.bb
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
recipes-qt/qt5/qtwayland_git.bb FILES_${PN}-plugins-dbg += " \ · line 48
Quoted 7 lines
index b208961..e315924 100644
recipes-qt/qt5/qtwayland_git.bb +0
-0@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
\
Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 23 lines
Quoted 13 lines
Quoted 8 lines
Quoted 8 lines
\
Quoted 7 lines
Quoted 6 lines
recipes-qt/qt5/qtwayland_git.bb +0
-1" SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" --2.7.4
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
--
Martin 'JaMa' Jansa jabber: [email protected]Quoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Yes, it builds fine now, notice: " * squashed with https://patchwork.
openembedded.org/patch/135662/"
Quoted 416 lines · Denys Dmytriyenko
Not sure about that, here's the output of git log -p qtwayland_git.bb from morty-next and seems to build fine:
commit
17abfb37eb59c7b78abe80aa45072ce0ed63491dAuthor: Mikko Gronoff <[email protected]> Date: Wed Dec 28 08:06:54 2016 +0200qt5: update submodule SRCREVs to 5.7.1 release
* squashed with https://patchwork.openembedded.org/patch/135662/
qtwayland: update patch to apply with Qt 5.7.1Update 0001-Fix-building-of-QWaylandIntegration-if-some-
Qt5-feat.patch
to apply on Qt 5.7.1 sources.Change-Id I541f6fb5a706cdec3451dad015590a6624298a18Signed-off-by Mikko Gronoff <[email protected]>Signed-off-by Martin Jansa <[email protected]>recipes-qt/qt5/qtwayland_ renamed from recipes-qt/qt5/qtwayland_git.bb +0
-0git.bb
index e315924..6ffc112 100644recipes-qt/qt5/qtwayland_git.bb +1
-1@@ -49,4 +49,4 @@ SRC_URI += " \ file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " -SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" +SRCREV = "4b23163fb64a5a8d05320dd006962cf2bcefcd84"commit
5c5b6b3f30d7eae730b77d6701b4410416172951Author: Vesa Jääskeläinen <[email protected]> Date: Thu Dec 22 17:14:49 2016 -0500qtwayland: Fix building of QWaylandIntegration if some Qt5 features are
disabled.QPlatformIntegration's interface methods are disabled based on
QT_NO_OPENGL,
QT_NO_CLIPBOARD,QT_NO_DRAGANDDROP,QT_NO_ACCESSIBILITYandQT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland.Signed-off-by Vesa Jääskeläinen <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>Signed-off-by Martin Jansa <[email protected]>recipes-qt/qt5/qtwayland_ renamed from recipes-qt/qt5/qtwayland_git.bb +0
-0git.bb
index b208961..e315924 100644recipes-qt/qt5/qtwayland_git.bb +1
-0@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ "SRCREV = "
a172672484b9496819e588b51ac2ff9fb4a21941"Quoted 7 lines · Martin Jansa
Was it really merged?
Then why was it updated here instead of removing it completely?
https://patchwork.openembedded.org/patch/135662/
On Sat, Jan 14, 2017 at 12:24 AM, Denys Dmytriyenko <[email protected]>
Quoted 10 lines · wrote:
Quoted 10 lines · Denys Dmytriyenko
Quoted 7 lines · Denys Dmytriyenko
Quoted 6 lines · Martin Jansa
Quoted 1 line
morty-next
I'm getting this:
qtwebengine-5.7.1+gitAUTOINC+9cc97f0c63_b3c79e92f0-r0
do_fetch:Fetcher failure: Unable to find revision
9cc97f0c63049a8076476acc89c875
c9e240abfbQuoted 3 lines
Quoted 3 lines
in branch 5.7 even from upstream
Quoted 2 lines
But the good news is that qtwayland no longer seem to require the
patch
Quoted 10 lines
Quoted 10 lines
in
Quoted 1 line
question for QWaylandIntegration!
Ah, Never mind - just noticed that the patch was already merged before 5.7.1.
I'll try fixing qtwebengine commit...
Quoted 1 line
Quoted 1 line
Quoted 1 line
On Wed, Jan 11, 2017 at 1:27 AM, Denys Dmytriyenko <
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines · wrote:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines · Martin Jansa
Quoted 1 line
On Thu, Dec 22, 2016 at 05:14:49PM -0500, Denys Dmytriyenko
Quoted 3 lines · wrote:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
From: Vesa Jääskeläinen <[email protected]>
QPlatformIntegration's interface methods are disabled
based on
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
QT_NO_OPENGL,Quoted 2 lines
Quoted 2 lines
QT_NO_CLIPBOARD,QT_NO_DRAGANDDROP,QT_NO_ACCESSIBILITYandQT_NO_SESSIONMANAGER, these has to be taken into accountwhen
Quoted 5 lines
Quoted 5 lines
compiling
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
QtWayland.
Is this still needed with:
[oe] [meta-qt5][morty][PATCH] qt5: update submodule SRCREVsto
Quoted 4 lines
Quoted 4 lines
5.7.1
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
release
Quoted 2 lines
The .patch doesn't apply in 5.7.1 anymore and I haven't had
time
Quoted 6 lines
Quoted 6 lines
to find
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
out why.
I haven't tried it. Is 5.7.1 already in morty?
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Signed-off-by Vesa Jääskeläinen <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Denys Dmytriyenko <[email protected]>--- recipes-qt/qt5/qtwayland-native_git.bb | 1+
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156+++++++++++++++++++++
Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb | 1+
Quoted 13 lines
Quoted 13 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-0b/recipes-qt/qt5/
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
qtwayland-native_git.bb
Quoted 5 lines
Quoted 5 lines
index a214346..1149aa5 100644
recipes-qt/qt5/qtwayland-native_git.bb +0
-0@@ -18,6 +18,7 @@ DEPENDS = "qtbase-native wayland-native"Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
recipes-qt/qt5/qtwayland-native_git.bb DEPENDS = "qtbase-native wayland-native" · line 20
Quoted 2 lines
recipes-qt/qt5/qtwayland-native_git.bb +0
-0SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
\
Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland-native_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-
Quoted 6 lines
Quoted 6 lines
Qt5-feat.patch
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
\
Quoted 4 lines
Review
Quoted 4 lines
recipes-qt/qt5/qtwayland-native_git.bb +0
-0" do_configure() {(quoted diff) +0
-00001-Fix-building-of-
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
QWaylandIntegration-if-some-Qt5-feat.patch
b/recipes-qt/qt5/qtwayland/
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
0001-Fix-building-of-QWaylandIntegration-if-some-
Qt5-feat.patch
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of-
Quoted 4 lines
new file mode 100644
index 0000000..d173e67recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +0
-0QWaylandIntegration-if-some-Qt5-feat.patch
Quoted 8 lines
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 1
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0@@ -0,0 +1,156 @@ +From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 1700:00:00
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
2001
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 2
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 4
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+Date: Sun, 18 Sep 2016 11:51:59 +0300 +Subject: [PATCH] Fix building of QWaylandIntegration ifsome
Quoted 5 lines
Quoted 5 lines
Qt5
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
features are
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 7
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+ disabled. + +QPlatformIntegration's interface methods are disabledbased on
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
QT_NO_OPENGL,Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITYand
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 9
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+QT_NO_SESSIONMANAGER, these has to be taken into accountwhen
Quoted 9 lines
Quoted 9 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
compiling
Quoted 3 lines
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+QtWayland. +--- + src/client/qwaylandintegration.cpp | 21++++++++++++++++++---
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 16
Quoted 4 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +4
-0+ src/client/qwaylandintegration_p.h | 12 ++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/client/qwaylandintegration.cppb/src/client/
Quoted 67 lines
Quoted 67 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
qwaylandintegration.cpp
Quoted 16 lines
Quoted 16 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +16
-0+index 39fff53..481e3d6 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -39,7 +39,9 @@ + #include "qwaylandinputcontext_p.h" + #include "qwaylandshmbackingstore_p.h" + #include "qwaylandnativeinterface_p.h" ++#ifndef QT_NO_CLIPBOARD + #include "qwaylandclipboard_p.h" ++#endif + #include "qwaylanddnd_p.h" + #include "qwaylandwindowmanagerintegration_p.h" + #include "qwaylandscreen_p.h" +@@ -57,7 +59,9 @@ + #include <QSocketNotifier> +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 40
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ #include <qpa/qplatforminputcontextfactory_p.h> ++#ifndef QT_NO_ACCESSIBILITY + #include <qpa/qplatformaccessibility.h> ++#endif + #include <qpa/qplatforminputcontext.h> + + #include "qwaylandhardwareintegration_p.h" +@@ -117,8 +121,6 @@ QWaylandIntegration::
QWaylandIntegration()Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 49
Quoted 9 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +9
-0+ , mNativeInterface(new QWaylandNativeInterface(this)) + #ifndef QT_NO_ACCESSIBILITY + , mAccessibility(new QPlatformAccessibility()) +-#else +- , mAccessibility(0) + #endif + , mClientBufferIntegrationInitialized(false) + , mServerBufferIntegrationInitialized(false) +@@ -126,9 +128,12 @@ QWaylandIntegration::
QWaylandIntegration()Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 60
Quoted 11 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +11
-0+ { + initializeInputDeviceIntegration(); + mDisplay = new QWaylandDisplay(this); ++#ifndef QT_NO_CLIPBOARD + mClipboard = new QWaylandClipboard(mDisplay); ++#endif ++#ifndef QT_NO_DRAGANDDROP + mDrag = new QWaylandDrag(mDisplay); +- ++#endif + QString icStr = QPlatformInputContextFactory::
requested();Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 61
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+ icStr.isNull() ? mInputContext.reset(newQWaylandInputContext(mDisplay))
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 62
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+ : mInputContext.reset(
QPlatformInputContextFactory::create(icStr));Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +1
-0+@@ -136,8 +141,12 @@ QWaylandIntegration::
QWaylandIntegration()Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +13
-0+ + QWaylandIntegration::~QWaylandIntegration() + { ++#ifndef QT_NO_DRAGANDDROP + delete mDrag; ++#endif ++#ifndef QT_NO_CLIPBOARD + delete mClipboard; ++#endif + #ifndef QT_NO_ACCESSIBILITY + delete mAccessibility; + #endif +@@ -213,15 +222,19 @@ QPlatformFontDatabaseQuoted 7 lines
Quoted 7 lines
*QWaylandIntegration::fontDatabase()Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
const
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ return mFontDb; + } + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QWaylandIntegration::clipboard()const
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ { + return mClipboard; + } ++#endif +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 94
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *QWaylandIntegration::drag() const + { + return mDrag; + } ++#endif + + QPlatformInputContext *QWaylandIntegration::
inputContext()Quoted 10 lines
Quoted 10 lines
const
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 96
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+ { +@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
hint) const
Quoted 5 lines
Quoted 5 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +5
-0+ return QPlatformIntegration::styleHint(hint); + } + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *QWaylandIntegration::
accessibility()Quoted 9 lines
Quoted 9 lines
const
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 109
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +8
-0+ { + return mAccessibility; + } ++#endif + + QPlatformServices *QWaylandIntegration::services() const + { +diff --git a/src/client/qwaylandintegration_p.hb/src/client/
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
qwaylandintegration_p.hQuoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 115
Quoted 6 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +6
-0+index 987d805..b50ad95 100644 +--- a/src/client/qwaylandintegration_p.h ++++ b/src/client/qwaylandintegration_p.h +@@ -80,15 +80,21 @@ public: + + QPlatformNativeInterface *nativeInterface() const
Q_DECL_OVERRIDE;Quoted 3 lines
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+ ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *clipboard() const
Q_DECL_OVERRIDE;Quoted 10 lines
Quoted 10 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 125
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *drag() const Q_DECL_OVERRIDE; ++#endif + + QPlatformInputContext *inputContext() const
Q_DECL_OVERRIDE;Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +2
-0+ + QVariant styleHint(StyleHint hint) const
Q_DECL_OVERRIDE;Quoted 23 lines
Quoted 23 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- line 130
Quoted 3 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +3
-0+ ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *accessibility() const
Q_DECL_OVERRIDE;Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +19
-0++#endif + + QPlatformServices *services() const Q_DECL_OVERRIDE; + +@@ -117,12 +123,18 @@ private: + void initializeInputDeviceIntegration(); + + QPlatformFontDatabase *mFontDb; ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *mClipboard; ++#endif ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *mDrag; ++#endif + QWaylandDisplay *mDisplay; + QPlatformNativeInterface *mNativeInterface; + QScopedPointer<QPlatformInputContext> mInputContext; ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *mAccessibility;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-Fix-building-of- new file +7
-0++#endif + bool mClientBufferIntegrationInitialized; + bool mServerBufferIntegrationInitialized; + bool mShellIntegrationInitialized; +-- +2.7.4 +(quoted diff) +0
-0b/recipes-qt/qt5/
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
qtwayland_git.bb
Quoted 7 lines
recipes-qt/qt5/qtwayland_git.bb FILES_${PN}-plugins-dbg += " \ · line 48
Quoted 7 lines
index b208961..e315924 100644
recipes-qt/qt5/qtwayland_git.bb +0
-0@@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-
Quoted 3 lines
Quoted 3 lines
when-bui.patch
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
\
Quoted 1 line
Quoted 1 line
recipes-qt/qt5/qtwayland_git.bb +1
-0+ file://0001-Fix-building-of-QWaylandIntegration-if-some-
Quoted 25 lines
Quoted 25 lines
Qt5-feat.patch
Quoted 23 lines
Quoted 13 lines
Quoted 8 lines
Quoted 8 lines
\
Quoted 7 lines
Quoted 6 lines
recipes-qt/qt5/qtwayland_git.bb +0
-1" SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" --2.7.4
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
--
Martin 'JaMa' Jansa jabber: [email protected]Quoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel