This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 419e41ebe48918bb8c5798c958f94ccea73b369f Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Nov 15 03:38:29 2018 +0100 accessdialog.cpp: re-enable Qt4 compatibility. --- accessdialog.cpp | 8 ++++++++ debian/changelog | 1 + 2 files changed, 9 insertions(+) diff --git a/accessdialog.cpp b/accessdialog.cpp index 1f775e7..b1010ae 100644 --- a/accessdialog.cpp +++ b/accessdialog.cpp @@ -42,10 +42,18 @@ AccessWindow::AccessWindow(QString uname, QString hname, QWidget *parent) /* dialog buttons */ QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Grant access")); +#if QT_VERSION < 0x050000 + connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); +#else connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); +#endif buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Deny access")); buttonBox->button(QDialogButtonBox::Cancel)->setDefault(true); +#if QT_VERSION < 0x050000 + connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); +#else connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); +#endif hbox->addWidget(buttonBox, 1, Qt::AlignRight | Qt::AlignBottom); /* modality */ diff --git a/debian/changelog b/debian/changelog index 7342a68..21730ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium * New upstream version (3.2.0.0): - sharetray.cpp: fix misleading if indentation warning. - sharetray.cpp: fix another misleading if indentation warning. + - accessdialog.cpp: re-enable Qt4 compatibility. * x2godesktopsharing.spec: + Pull in redhat-rpm-config manually. This should probably be done by something else, like... gcc or qmake or qt(4)-dev, but it isn't. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git