diff options
| author | Palo Kisa <palo.kisa@gmail.com> | 2016-05-20 15:08:00 +0200 |
|---|---|---|
| committer | Palo Kisa <palo.kisa@gmail.com> | 2016-06-15 12:51:56 +0000 |
| commit | 5eda3cff5e18308f8d78d438e5aeb4e685c5f974 (patch) | |
| tree | 791ae2b75b126ca499651b5a8fe302dfd9f4bab0 /src | |
| parent | 3d3d65f538fa22eb8c5d9c8a4bad53bf79515848 (diff) | |
QIconLoader: Fix typo in directoryMatchesSize()
For QIconDirInfo::Scalable directories condition for
directoryMatchesSize was mistyped. In particular only the minSize was
considered which could lead to false positive checks.
[ChangeLog][QtGui][QIconLoaderEngine] Fixed theme lookup for scalable
entries
Change-Id: Ic7e06cc0a2e4be69e6633847cef8c2c5686378ea
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/qiconloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 3ead72dfbb..c7f1f2beb4 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -403,7 +403,7 @@ static bool directoryMatchesSize(const QIconDirInfo &dir, int iconsize) return dir.size == iconsize; } else if (dir.type == QIconDirInfo::Scalable) { - return dir.size <= dir.maxSize && + return iconsize <= dir.maxSize && iconsize >= dir.minSize; } else if (dir.type == QIconDirInfo::Threshold) { |