From 8b2c47cdcb4d1956aad1f642dbbc8d481aee3f07 Mon Sep 17 00:00:00 2001 From: Michael Schuster Date: Fri, 6 Sep 2019 17:05:18 +0200 Subject: [PATCH] Remove old Qt 5.5 patch for Xenial Signed-off-by: Michael Schuster --- .../post-patches/qt5.5-compat.patch | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/admin/linux/debian/debian.xenial/post-patches/qt5.5-compat.patch b/admin/linux/debian/debian.xenial/post-patches/qt5.5-compat.patch index f6475205c..70c71d462 100644 --- a/admin/linux/debian/debian.xenial/post-patches/qt5.5-compat.patch +++ b/admin/linux/debian/debian.xenial/post-patches/qt5.5-compat.patch @@ -1,43 +1,3 @@ ---- nextcloud-client-2.4.0.orig/src/gui/wizard/owncloudoauthcredspage.cpp -+++ nextcloud-client-2.4.0/src/gui/wizard/owncloudoauthcredspage.cpp -@@ -53,10 +53,8 @@ OwncloudOAuthCredsPage::OwncloudOAuthCredsPage() - _ui.openLinkButton->setContextMenuPolicy(Qt::CustomContextMenu); - QObject::connect(_ui.openLinkButton, &QWidget::customContextMenuRequested, [this](const QPoint &pos) { - auto menu = new QMenu(_ui.openLinkButton); -- menu->addAction(tr("Copy link to clipboard"), this, [this] { -- if (_asyncAuth) -- QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded)); -- }); -+ auto action = menu->addAction(tr("Copy link to clipboard")); -+ connect(action, &QAction::triggered, this, &OwncloudOAuthCredsPage::copyLinkToClipboard); - menu->setAttribute(Qt::WA_DeleteOnClose); - menu->popup(_ui.openLinkButton->mapToGlobal(pos)); - }); -@@ -131,4 +129,11 @@ bool OwncloudOAuthCredsPage::isComplete() const - return false; /* We can never go forward manually */ - } - -+void OwncloudOAuthCredsPage::copyLinkToClipboard() -+{ -+ if (_asyncAuth) -+ QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded)); -+} -+ -+ - } // namespace OCC ---- nextcloud-client-2.4.0.orig/src/gui/wizard/owncloudoauthcredspage.h -+++ nextcloud-client-2.4.0/src/gui/wizard/owncloudoauthcredspage.h -@@ -57,6 +57,10 @@ public: - QString _refreshToken; - QScopedPointer _asyncAuth; - Ui_OwncloudOAuthCredsPage _ui; -+ -+protected slots: -+ void copyLinkToClipboard(); -+ - }; - - } // namespace OCC --- nextcloud-client-2.5.3.orig/src/3rdparty/kmessagewidget/kmessagewidget.cpp 2019-07-26 18:40:34.949349387 +0000 +++ nextcloud-client-2.5.3/src/3rdparty/kmessagewidget/kmessagewidget.cpp 2019-07-26 18:41:39.866478051 +0000 @@ -105,6 +105,9 @@ -- 2.30.2