[X2Go-Commits] [x2goclient] 01/03: src/compat.h: keep using QString::SkipEmptyParts/KeepEmptyParts for Qt < 5.14.0.

[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 x2goclient.

commit 362cfaa47200532a281038e37ca5f4fc987e15df
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jun 30 10:32:16 2024 +0200

    src/compat.h: keep using QString::SkipEmptyParts/KeepEmptyParts for Qt < 5.14.0.
---
 debian/changelog | 2 ++
 src/compat.h     | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a0f382b0..ec362069 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ x2goclient (4.1.2.4-0x2go1) UNRELEASED; urgency=medium
     - src/httpbrokerclient.cpp: handle missing server name/address gracefully.
     - src/httpbrokerclient.cpp: parse port value (if provided) and handle
       errors gracefully.
+    - src/compat.h: keep using QString::SkipEmptyParts/KeepEmptyParts for Qt <
+      5.14.0.
   * x2goclient.spec:
     + Add Recommends: x2gokdriveclient for FC30+, RH 8+, *SuSE 15.4+.
     + Fix typo leading to FTBFS in Fedora macro.
diff --git a/src/compat.h b/src/compat.h
index 1f23ab55..96797c36 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -36,4 +36,9 @@ char *strndup (const char *s, size_t n);
 #endif /* MAC_OS_X_VERSION_MIN_REQUIRED */
 #endif /* defined (Q_OS_DARWIN) */
 
+#if QT_VERSION < QT_VERSION_CHECK (5, 14, 0)
+#define Qt::SkipEmptyParts QString::SkipEmptyParts
+#define Qt::KeepEmptyParts QString::KeepEmptyParts
+#endif
+
 #endif /* !defined (COMPAT_H) */

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