Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-29 17:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/2.6.1' into develop

Browse source
This commit is contained in:
Jonathan White 2020-07-12 20:51:37 -04:00
commit 88a0a8d35a
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/Resources.cpp
View file

@ -153,6 +153,15 @@ QIcon Resources::icon(const QString& name, bool recolor, const QColor& overrideC
return icon; return icon;
} }
// Resetting the application theme name before calling QIcon::fromTheme() is required for hacky
// QPA platform themes such as qt5ct, which randomly mess with the configured icon theme.
// If we do not reset the theme name here, it will become empty at some point, causing
// Qt to look for icons at the user-level and global default locations.
//
// See issue #4963: https://github.com/keepassxreboot/keepassxc/issues/4963
// and qt5ct issue #80: https://sourceforge.net/p/qt5ct/tickets/80/
QIcon::setThemeName("application");
icon = QIcon::fromTheme(name); icon = QIcon::fromTheme(name);
if (getMainWindow() && recolor) { if (getMainWindow() && recolor) {
QImage img = icon.pixmap(128, 128).toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied); QImage img = icon.pixmap(128, 128).toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied);

2
src/keys/drivers/YubiKey.cpp
View file

@ -176,7 +176,7 @@ void YubiKey::findValidKeys()
bool wouldBlock; bool wouldBlock;
QList<QPair<int, QString>> ykSlots; QList<QPair<int, QString>> ykSlots;
for (int slot = 1; slot <= 2; ++slot) { for (int slot = 1; slot <= 2; ++slot) {
auto config = (i == 1 ? CONFIG1_VALID : CONFIG2_VALID); auto config = (slot == 1 ? CONFIG1_VALID : CONFIG2_VALID);
if (!(ykds_touch_level(st) & config)) { if (!(ykds_touch_level(st) & config)) {
// Slot is not configured // Slot is not configured
continue; continue;