diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-20 07:54:09 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-20 07:54:09 +0000 |
| commit | 5f0ec7305e4310123ddeb98d3523087e3c560d9c (patch) | |
| tree | fbcad900b0b604a1005320c5015723c343807974 /src/gui/image/qiconloader.cpp | |
| parent | 683c30074e4b7c9048e9970de1851e5d9a6deeb4 (diff) | |
| parent | e32f1a4d61f0c55d066a43657ad607131be8ca34 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/gui/image/qiconloader.cpp')
| -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 2f24165069..0233ccbf87 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -563,7 +563,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) { |