From 59ef95fdaecd0506b99a4144c7a2ae1194ada729 Mon Sep 17 00:00:00 2001 From: Julien CORJON Date: Thu, 17 Mar 2016 10:42:28 +0100 Subject: qt5: bump version to 5.6.0 Remove upstream committed patches (qt5base): - 0001-Force_egl_visual_ID_33.patch (see [1], [2]) - 0003-xcb-egl-fixes.patch (see [3]) - 0005-forkd-disable-eventfd-for-uclibc.patch (see [4], [5]) - 0009-fix-eglfs-for-sunxi-mali.patch (see [6]) - 0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch (see [7]) Remove MX6_WORKAROUND from qt5base.mk since we do not need to tweak EGL visual ID to 33. Remove upstream committed patch (qt5webchannel): - 0001-Fix-builds-without-qml-module.patch (see [8], [9]) Fix Qt5Enginio to 1.6.0 version (see [10]) [1] https://bugreports.qt.io/browse/QTBUG-44290 [2] https://codereview.qt-project.org/#/c/108849/ [3] https://codereview.qt-project.org/#/c/115438/ [4] https://bugreports.qt.io/browse/QTBUG-47337 [5] https://codereview.qt-project.org/#/c/121988/ [6] https://codereview.qt-project.org/#/c/125837/ [7] https://codereview.qt-project.org/#/c/126725/ [8] https://bugreports.qt.io/browse/QTBUG-47360 [9] https://codereview.qt-project.org/#/c/122086/ [10] https://bugreports.qt.io/browse/QTBUG-50111 Signed-off-by: Julien Corjon Signed-off-by: Thomas Petazzoni --- .../0001-Fix-builds-without-qml-module.patch | 61 ---------------------- 1 file changed, 61 deletions(-) delete mode 100644 package/qt5/qt5webchannel/0001-Fix-builds-without-qml-module.patch (limited to 'package/qt5/qt5webchannel/0001-Fix-builds-without-qml-module.patch') diff --git a/package/qt5/qt5webchannel/0001-Fix-builds-without-qml-module.patch b/package/qt5/qt5webchannel/0001-Fix-builds-without-qml-module.patch deleted file mode 100644 index 0eb007e4e0..0000000000 --- a/package/qt5/qt5webchannel/0001-Fix-builds-without-qml-module.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 4dee412aa655e1dc7f9e01869abcab47e0179422 Mon Sep 17 00:00:00 2001 -From: Julien Corjon -Date: Wed, 22 Jul 2015 09:24:04 +0200 -Subject: [PATCH] Fix builds without qml module - -When we build without qml module we cannot use QJSValue in qmetaobjectpublisher -To prevent QJSValue inclusiion I use a preprocessor directive QT_HAVE_QML. This -is probably not the best solution but I do not know any other QML directive. - -Upstream--Status: https://bugreports.qt.io/browse/QTBUG-47360 -Signed-off-by: Julien Corjon ---- - src/webchannel/qmetaobjectpublisher.cpp | 4 ++++ - src/webchannel/webchannel.pro | 2 ++ - 2 files changed, 6 insertions(+) - -diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp -index 0cad569..b0e9652 100644 ---- a/src/webchannel/qmetaobjectpublisher.cpp -+++ b/src/webchannel/qmetaobjectpublisher.cpp -@@ -41,7 +41,9 @@ - #include - #include - #include -+#ifdef QT_HAVE_QML - #include -+#endif - #include - - QT_BEGIN_NAMESPACE -@@ -486,12 +488,14 @@ QJsonValue QMetaObjectPublisher::wrapResult(const QVariant &result, QWebChannelA - if (!classInfo.isEmpty()) - objectInfo[KEY_DATA] = classInfo; - return objectInfo; -+#ifdef QT_HAVE_QML - } else if (result.canConvert()) { - // Workaround for keeping QJSValues from QVariant. - // Calling QJSValue::toVariant() converts JS-objects/arrays to QVariantMap/List - // instead of stashing a QJSValue itself into a variant. - // TODO: Improve QJSValue-QJsonValue conversion in Qt. - return wrapResult(result.value().toVariant(), transport, parentObjectId); -+#endif - } else if (result.canConvert()) { - // recurse and potentially wrap contents of the array - return wrapList(result.toList(), transport); -diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro -index eba8123..f476d6f 100644 ---- a/src/webchannel/webchannel.pro -+++ b/src/webchannel/webchannel.pro -@@ -30,6 +30,8 @@ SOURCES += \ - qtHaveModule(qml) { - QT += qml - -+ QMAKE_CXXFLAGS += "-DQT_HAVE_QML" -+ - SOURCES += \ - qqmlwebchannel.cpp \ - qqmlwebchannelattached.cpp --- -2.1.0 - -- cgit v1.2.3