From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/pulseview: fix patch
Date: Thu, 25 Mar 2021 08:34:34 +0100 [thread overview]
Message-ID: <20210325073434.625844-1-fontaine.fabrice@gmail.com> (raw)
Commit 4b7db318262a023a4a5396b06adafd9fd19d40a3 forgot to restore
upstream patch
Fixes:
- http://autobuild.buildroot.org/results/589cfc6ea43dc5e714751f05be488f5c469641b9
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
.../0001-Replace-obsolete-deprecated-Qt-methods.patch | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch b/package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch
index 42cdc467be..047fe2cccd 100644
--- a/package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch
+++ b/package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch
@@ -7,6 +7,8 @@ Subject: [PATCH] Replace obsolete/deprecated Qt methods
ae726b70a7ada9a4be5808e00f0c951318479684, one conflict manually
resolved in pv/util.cpp.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+[Fabrice: restore original patch in pv/util.cpp for 0.4.2]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
pv/util.cpp | 21 +++++++++++++++++++--
pv/util.hpp | 10 ++++++++++
@@ -25,8 +27,8 @@ index 49b9467c..2a63038d 100644
if (sign && !v.is_zero())
- ts << forcesign;
+ ts.setNumberFlags(ts.numberFlags() | QTextStream::ForceSign);
- ts << qSetRealNumberPrecision(precision) << (v * multiplier) << ' '
- << prefix << unit;
+ ts << qSetRealNumberPrecision(precision) << (v * multiplier);
+ ts << ' ' << prefix << unit;
@@ -171,7 +171,7 @@ QString format_value_si(double v, SIPrefix prefix, unsigned precision,
QString s;
--
2.30.1
next reply other threads:[~2021-03-25 7:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 7:34 Fabrice Fontaine [this message]
2021-03-29 9:06 ` [Buildroot] [PATCH 1/1] package/pulseview: fix patch Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210325073434.625844-1-fontaine.fabrice@gmail.com \
--to=fontaine.fabrice@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.