[X2Go-Commits] [x2goclient] 01/01: onmainwindow.cpp: unbreak builds by fixing syntax error.
git-admin at x2go.org
git-admin at x2go.org
Sun Jun 16 19:00:08 CEST 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 84bc75d1ace5f3990a07363b0cb95abb829a75af
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun Jun 16 18:59:56 2019 +0200
onmainwindow.cpp: unbreak builds by fixing syntax error.
---
debian/changelog | 1 +
src/onmainwindow.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index aa49a65..b46450c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -100,6 +100,7 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
--bypass-cleanup-helper parameter.
- onmainwindow.cpp: fix building with Qt 4.6, currently the latest version
available in EPEL 6.
+ - onmainwindow.cpp: unbreak builds by fixing syntax error.
* debian/control:
+ Add build-depend on pkg-config.
* x2goclient.spec:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 074d132..71c2a63 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -3565,7 +3565,7 @@ void ONMainWindow::startDirectRDP()
#if QT_VERSION < 0x040700
resumingSession.sessionId += QString::number(QDateTime::currentDateTime().toTime_t())
#else
- resumingSession.sessionId += QString::number(QDateTime::currentDateTime().toMSecsSinceEpoch()/1000)
+ resumingSession.sessionId += QString::number(QDateTime::currentDateTime().toMSecsSinceEpoch()/1000);
#endif
resumingSession.sessionId += "_stRRDP_dp24";
resumingSession.display="RDP";
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list