[X2Go-Commits] [x2goclient] 03/03: onmainwindow.cpp: fix building with Qt 4.6, currently the latest version available in EPEL 6.

[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 74e416234a41816788cc836b9148d86847fd2ef1
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jun 16 18:28:28 2019 +0200

    onmainwindow.cpp: fix building with Qt 4.6, currently the latest version available in EPEL 6.
---
 debian/changelog     | 2 ++
 src/onmainwindow.cpp | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f926b20..9c6ba95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -98,6 +98,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
       but necessary fonts.* file regeneration hook.
     - {x2goclient,help,onmainwindow}.cpp: implement new
       --bypass-cleanup-helper parameter.
+    - onmainwindow.cpp: fix building with Qt 4.6, currently the latest version
+      available in EPEL 6.
   * debian/control:
     + Add build-depend on pkg-config.
   * x2goclient.spec:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 5f8a75a..074d132 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -3561,7 +3561,13 @@ void ONMainWindow::startDirectRDP()
 //     x2goDebug<<"starting direct session with cmd:"<<proxyCmd;
     nxproxy->start ( proxyCmd );
     resumingSession.server=host;
-    resumingSession.sessionId=user+"-RDP-"+QString::number(QDateTime::currentDateTime().toMSecsSinceEpoch()/1000)+"_stRRDP_dp24";
+    resumingSession.sessionId=user+"-RDP-";
+#if QT_VERSION < 0x040700
+    resumingSession.sessionId += QString::number(QDateTime::currentDateTime().toTime_t())
+#else
+    resumingSession.sessionId += QString::number(QDateTime::currentDateTime().toMSecsSinceEpoch()/1000)
+#endif
+    resumingSession.sessionId += "_stRRDP_dp24";
     resumingSession.display="RDP";
     resumingSession.command="RDP";
     resumingSession.crTime=QDateTime::currentDateTime().toString("dd.MM.yy HH:mm:ss");

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