diff options
| author | Michael Schuster <michael@schuster.ms> | 2019-12-10 00:45:47 +0300 |
|---|---|---|
| committer | Michael Schuster <michael@schuster.ms> | 2019-12-10 00:45:47 +0300 |
| commit | 03b11693a39c519d93febbd2dc3db204b5344cf0 (patch) | |
| tree | 1d5358329488efdfb88d9d767c2e013a63514524 | |
| parent | 23f2d79f70394ff65712068cd46653f85741aedb (diff) | |
Fix build for stable-2.6 (changes from PR #1651)v2.6.2-rc1
Signed-off-by: Michael Schuster <michael@schuster.ms>
| -rw-r--r-- | src/gui/sharelinkwidget.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp index e6d74d43f..1363cb482 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")); } |