[X2Go-Commits] [x2gokdriveclient] 01/01: client.cpp: allow building with Qt 5.8-, which does not support QWidget::setWindowFlag ().

[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 38bba51a43210bfb1155a34cb65f2b355b892f00
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Dec 15 00:40:16 2022 +0100

    client.cpp: allow building with Qt 5.8-, which does not support QWidget::setWindowFlag ().
    
    Use QWidget::setWindowFlags () with QWidget::windowFlags () and an
    additional call to show () instead on older platforms.
---
 client.cpp       | 5 +++++
 debian/changelog | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/client.cpp b/client.cpp
index 82e49d2..6f8cf57 100644
--- a/client.cpp
+++ b/client.cpp
@@ -256,7 +256,12 @@ void Client::initDesktopMode()
     if(noresize)
     {
         setFixedSize(QSize(width,height));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
         setWindowFlag(Qt::MSWindowsFixedSizeDialogHint);
+#else
+        setWindowFlags(windowFlags () | Qt::MSWindowsFixedSizeDialogHint);
+        show ();
+#endif
     }
 
 }
diff --git a/debian/changelog b/debian/changelog
index ad9e55e..1ef0d2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       for documentation purposes, since this feature should be enabled by
       default.
     - x2gokdriveclient.pro: whitespace only.
+    - client.cpp: allow building with Qt 5.8-, which does not support
+      QWidget::setWindowFlag (). Use QWidget::setWindowFlags () with
+      QWidget::windowFlags () and an additional call to show () instead on
+      older platforms.
   * debian/rules:
     * Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them.
       Especially needed for C++11 support.

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