[X2Go-Commits] [x2gokdriveclient] 01/01: client.{cpp|h}: Don't hide Client::slotSelectionChanged on Linux. Older Qt5 version (as found in Debian stretch) choke on the ifdef'ed out code portions when parsing auto-generated moc_client.cpp.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gokdriveclient.

commit 890405df075f26bfd355c061c247910ec60170ea
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 14 13:41:29 2021 +0200

    client.{cpp|h}: Don't hide Client::slotSelectionChanged on Linux. Older Qt5 version (as found in Debian stretch) choke on the ifdef'ed out code portions when parsing auto-generated moc_client.cpp.
---
 client.cpp       | 9 +++++++--
 client.h         | 2 --
 debian/changelog | 5 ++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/client.cpp b/client.cpp
index c1c44bb..8b0d1d2 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1595,10 +1595,12 @@ void Client::send_selnotify_to_server(SelectionType selection, SelectionMime mim
 }
 
 
-#ifndef Q_OS_LINUX
 void Client::slotSelectionChanged(QClipboard::Mode mode)
 {
-//we are not using QT Clipboard Class on Linux, seems that it has problems with INCR properties
+
+#ifndef Q_OS_LINUX
+
+    //we are not using QT Clipboard Class on Linux, seems that it has problems with INCR properties
     if(!connected)
         return;
     const QClipboard *clipboard = QGuiApplication::clipboard();
@@ -1643,8 +1645,11 @@ void Client::slotSelectionChanged(QClipboard::Mode mode)
         sendSelectionToServer(destination);
     }
 
+#endif
+
 }
 
+#ifndef Q_OS_LINUX
 void Client::sendSelectionToServer(SelectionType selection)
 {
     //sending selection data to server
diff --git a/client.h b/client.h
index f830905..874d0e4 100644
--- a/client.h
+++ b/client.h
@@ -200,9 +200,7 @@ private slots:
     void slotDisplayFS();
     void slotEnableRandr();
     void slotResizeFSFinal();
-#ifndef Q_OS_LINUX
     void slotSelectionChanged(QClipboard::Mode mode);
-#endif
 public slots:
     void editWindowTitle();
 
diff --git a/debian/changelog b/debian/changelog
index c8362cf..183140b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
 
   [ Mike Gabriel ]
-  * Initial release.
+  * Initial release:
+    - client.{cpp|h}: Don't hide Client::slotSelectionChanged on Linux. Older
+      Qt5 version (as found in Debian stretch) choke on the ifdef'ed out
+      code portions when parsing auto-generated moc_client.cpp.
 
   [ Mihai Moldovan ]
   * Initial release:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git