Merge remote-tracking branch 'origin/4.4'

Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
This commit is contained in:
Orgad Shaneh
2017-08-30 01:03:20 +03:00
92 changed files with 261 additions and 116 deletions

View File

@@ -827,9 +827,9 @@ QVector<int> MiniProjectTargetSelector::listWidgetWidths(int minSize, int maxSiz
int delta;
if (tooSmall)
delta = qMin(next - first, widthToDistribute / i);
delta = qMin(next - first, widthToDistribute / qMax(i, 1));
else
delta = qMin(first - next, widthToDistribute / i);
delta = qMin(first - next, widthToDistribute / qMax(i, 1));
if (delta == 0)
return result;