Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -1,61 +0,0 @@
|
||||
From 4dee412aa655e1dc7f9e01869abcab47e0179422 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Corjon <corjon.j@ecagroup.com>
|
||||
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 <corjon.j@ecagroup.com>
|
||||
---
|
||||
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 <QDebug>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
+#ifdef QT_HAVE_QML
|
||||
#include <QJSValue>
|
||||
+#endif
|
||||
#include <QUuid>
|
||||
|
||||
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<QJSValue>()) {
|
||||
// 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<QJSValue>().toVariant(), transport, parentObjectId);
|
||||
+#endif
|
||||
} else if (result.canConvert<QVariantList>()) {
|
||||
// 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
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebchannel-opensource-src-5.5.1.tar.xz.mirrorlist
|
||||
sha256 7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0 qtwebchannel-opensource-src-5.5.1.tar.xz
|
||||
# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtwebchannel-opensource-src-5.6.1-1.tar.xz.mirrorlist
|
||||
sha256 878ab614b30bbf04ef3775af68acd47de9765973650c1db403464e79efd07e82 qtwebchannel-opensource-src-5.6.1-1.tar.xz
|
||||
|
||||
@@ -11,8 +11,8 @@ QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets
|
||||
QT5WEBCHANNEL_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
|
||||
QT5WEBCHANNEL_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
|
||||
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.GPLv2
|
||||
QT5WEBCHANNEL_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
|
||||
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
|
||||
else
|
||||
QT5WEBCHANNEL_LICENSE = Commercial license
|
||||
QT5WEBCHANNEL_REDISTRIBUTE = NO
|
||||
|
||||
Reference in New Issue
Block a user