This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit bae28fa5cf78aef9b440d515e3ec240acb0fc654
Author: Mihai Moldovan <io...@ionic.de>
Date:   Thu Jun 14 07:18:04 2018 +0200

    src/onmainwindow.cpp: QProcess:nullDevice () is only available on Qt 5.2+, 
so use a workaround for older versions.
---
 debian/changelog     | 2 ++
 src/onmainwindow.cpp | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fe06805..28cc63d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -88,6 +88,8 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium
       since we'll never modify the data anyway.
     - src/onmainwindow.cpp: hook-in chgrp for ~/.x2go/etc on Windows platforms
       to work around a Cygwin permissions bug. Fixes: #1156.
+    - src/onmainwindow.cpp: QProcess:nullDevice () is only available on Qt
+      5.2+, so use a workaround for older versions.
   * x2goclient.spec:
     - Remove plugin references.
   * debian/rules:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 712bd4c..502415e 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10432,7 +10432,13 @@ void ONMainWindow::workaround_cygwin_permissions_issue 
() {
     args << "-R" << "-v" << etc_dir;
 
     QProcess chgrp;
-    chgrp.setStandardInputFile (nullDevice ());
+    chgrp.setStandardInputFile (
+#if QT_VERSION >= 0x050200
+                                QProcess::nullDevice ()
+#else
+                                "\\\\.\\NUL"
+#endif
+    );
     chgrp.start ("chgrp", args);
 
     bool fail = false;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

Reply via email to