From 03b11693a39c519d93febbd2dc3db204b5344cf0 Mon Sep 17 00:00:00 2001 From: Michael Schuster Date: Mon, 9 Dec 2019 22:45:47 +0100 Subject: [PATCH] Fix build for stable-2.6 (changes from PR #1651) Signed-off-by: Michael Schuster --- src/gui/sharelinkwidget.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp index e6d74d43f7aaa..1363cb482dbdb 100644 --- a/src/gui/sharelinkwidget.cpp +++ b/src/gui/sharelinkwidget.cpp @@ -505,12 +505,15 @@ void ShareLinkWidget::customizeStyle() _addAnotherLinkAction->setIcon(Theme::createColorAwareIcon(":/client/resources/add.png")); _ui->enableShareLink->setIcon(Theme::createColorAwareIcon(":/client/resources/copy.svg")); - - _ui->shareLinkIconLabel->setPixmap(Theme::createColorAwarePixmap(":/client/resources/public.svg")); - + +// only on master, not in stable-2.6 yet +// _ui->shareLinkIconLabel->setPixmap(Theme::createColorAwarePixmap(":/client/resources/public.svg")); + _ui->createShareButton->setIcon(Theme::createColorAwareIcon(":/client/resources/public.svg")); + _ui->shareLinkToolButton->setIcon(Theme::createColorAwareIcon(":/client/resources/more.svg")); - - _ui->confirmNote->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg")); + +// only on master, not in stable-2.6 yet +// _ui->confirmNote->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg")); _ui->confirmPassword->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg")); _ui->confirmExpirationDate->setIcon(Theme::createColorAwareIcon(":/client/resources/confirm.svg")); }