Skip to content

Commit

Permalink
Fix build for stable-2.6 (changes from PR #1651)
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Schuster <[email protected]>
  • Loading branch information
misch7 committed Dec 9, 2019
1 parent 23f2d79 commit 03b1169
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions src/gui/sharelinkwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
Expand Down

0 comments on commit 03b1169

Please sign in to comment.