This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit bb13d41578871588b42238ca4d5dac9908dc42e4 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 16 19:51:31 2019 +0200 onmainwindow.cpp: also unbreak old EPEL 6 builds. --- debian/changelog | 1 + src/onmainwindow.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b46450c..282d13a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -101,6 +101,7 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - onmainwindow.cpp: fix building with Qt 4.6, currently the latest version available in EPEL 6. - onmainwindow.cpp: unbreak builds by fixing syntax error. + - onmainwindow.cpp: also unbreak old EPEL 6 builds. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 71c2a63..cb6bb72 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3563,7 +3563,7 @@ void ONMainWindow::startDirectRDP() resumingSession.server=host; resumingSession.sessionId=user+"-RDP-"; #if QT_VERSION < 0x040700 - resumingSession.sessionId += QString::number(QDateTime::currentDateTime().toTime_t()) + resumingSession.sessionId += QString::number(QDateTime::currentDateTime().toTime_t()); #else resumingSession.sessionId += QString::number(QDateTime::currentDateTime().toMSecsSinceEpoch()/1000); #endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git