summaryrefslogtreecommitdiff
path: root/libre/qtcreator/qtcreatorbug-19367b.patch
diff options
context:
space:
mode:
authorFreemor <freemor@freemor.ca>2018-10-04 17:20:36 -0300
committerFreemor <freemor@freemor.ca>2018-10-04 17:20:36 -0300
commit9d88a917f22e0e5867005e677c33b927633d4358 (patch)
tree11f16fe30f6a4061c0d88fdf04aabe39bc14376f /libre/qtcreator/qtcreatorbug-19367b.patch
parentbffd30e9f286f86421868e953a1fde5f3554e6c9 (diff)
downloadabslibre-9d88a917f22e0e5867005e677c33b927633d4358.tar.gz
abslibre-9d88a917f22e0e5867005e677c33b927633d4358.tar.bz2
abslibre-9d88a917f22e0e5867005e677c33b927633d4358.zip
Update [qtcreator] to 4.7.1 and rebuild against clang 7.0.0 for x86_64 (i686/ARM not on clang 7.0.0 yet)
Diffstat (limited to 'libre/qtcreator/qtcreatorbug-19367b.patch')
-rw-r--r--libre/qtcreator/qtcreatorbug-19367b.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/libre/qtcreator/qtcreatorbug-19367b.patch b/libre/qtcreator/qtcreatorbug-19367b.patch
new file mode 100644
index 000000000..7603877cd
--- /dev/null
+++ b/libre/qtcreator/qtcreatorbug-19367b.patch
@@ -0,0 +1,42 @@
+From 813c16854df6be7fd1f1a8013d0b180f6248e5ab Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147@gmail.com>
+Date: Thu, 20 Sep 2018 13:48:58 +1000
+Subject: SshDeviceProcess: Don't emit readyRead signals if no data available
+
+Task-number: QTCREATORBUG-19367
+Change-Id: I477800b2e2060748c2b5f9fde3acc91d9f5ae176
+Reviewed-by: hjk <hjk@qt.io>
+Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
+---
+ src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
+index b34e0ce805..3bb813d55d 100644
+--- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
++++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
+@@ -245,13 +245,19 @@ void SshDeviceProcess::handleProcessFinished(int exitStatus)
+
+ void SshDeviceProcess::handleStdout()
+ {
+- d->stdOut += d->process->readAllStandardOutput();
++ QByteArray output = d->process->readAllStandardOutput();
++ if (output.isEmpty())
++ return;
++ d->stdOut += output;
+ emit readyReadStandardOutput();
+ }
+
+ void SshDeviceProcess::handleStderr()
+ {
+- d->stdErr += d->process->readAllStandardError();
++ QByteArray output = d->process->readAllStandardError();
++ if (output.isEmpty())
++ return;
++ d->stdErr += output;
+ emit readyReadStandardError();
+ }
+
+--
+cgit v1.2.1
+