diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-09-07 11:57:28 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-09-08 07:37:47 +0300 |
| commit | 88fe68f037f9da07f88d3212e0e2fc31e47f7723 (patch) | |
| tree | b9e32d18e7f22b088a0a1a12959562c657df2503 /meta-boot2qt | |
| parent | 99a0665f83362658ea1723449e44fd8aa5226336 (diff) | |
qbd: update revision
Build fix for Qt6.
Change-Id: I9a19ac87b0c5f85cf7e1915768695981eb4f1c50
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt')
| -rw-r--r-- | meta-boot2qt/recipes-qt/boot2qt-addons/qdb/0001-Add-include-for-QIODevice.patch | 38 | ||||
| -rw-r--r-- | meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb | 17 |
2 files changed, 47 insertions, 8 deletions
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/0001-Add-include-for-QIODevice.patch b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/0001-Add-include-for-QIODevice.patch new file mode 100644 index 00000000..26a982e7 --- /dev/null +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/0001-Add-include-for-QIODevice.patch @@ -0,0 +1,38 @@ +From 3caa4282924e615a2ab25276f06380e2525df629 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Mon, 7 Sep 2020 10:38:29 +0300 +Subject: [PATCH] Add include for QIODevice + +Change-Id: I0bd1e7de0cf56fc1c6a2594bcb963ead1c03ba4c +--- + libqdb/protocol/qdbtransport.cpp | 1 + + libqdb/streampacket.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libqdb/protocol/qdbtransport.cpp b/libqdb/protocol/qdbtransport.cpp +index 39e3323..204897b 100644 +--- a/libqdb/protocol/qdbtransport.cpp ++++ b/libqdb/protocol/qdbtransport.cpp +@@ -32,6 +32,7 @@ + + #include <QtCore/qdatastream.h> + #include <QtCore/qdebug.h> ++#include <QtCore/QIODevice> + #include <QtCore/qloggingcategory.h> + + Q_LOGGING_CATEGORY(transportC, "qdb.transport"); +diff --git a/libqdb/streampacket.h b/libqdb/streampacket.h +index 63896a6..2030962 100644 +--- a/libqdb/streampacket.h ++++ b/libqdb/streampacket.h +@@ -31,6 +31,7 @@ + + #include <QtCore/qbytearray.h> + #include <QtCore/qdatastream.h> ++#include <QtCore/QIODevice> + + class StreamPacket + { +-- +2.17.1 + diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb index abc0565e..8c0251e9 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb @@ -37,16 +37,17 @@ inherit qt6-qmake require recipes-qt/qt6/qt6-git.inc QT_GIT_PROJECT = "qt-apps" -QT_MODULE_BRANCH = "5.9" +QT_MODULE_BRANCH = "master" -SRC_URI += "file://b2qt-gadget-network.sh \ - file://defaults \ - file://qdbd.service \ - file://qdbd-init.sh \ - " +SRC_URI += "\ + file://b2qt-gadget-network.sh \ + file://defaults \ + file://qdbd.service \ + file://qdbd-init.sh \ +" -SRCREV = "b6553515d42cfe97a826533ec70947280bd1ee17" -PV = "1.2.0+git${SRCPV}" +SRCREV = "e4e958a68ffc0c9167e1ac22236410a30db15144" +PV = "1.2.1+git${SRCPV}" REQUIRED_DISTRO_FEATURES = "systemd" DEPENDS = "qtbase" |