← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kdeplasma-addons/trusty

« back to all changes in this revision

Viewing changes to applets/icontasks/taskitemlayout.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2011-12-23 17:57:06 UTC
  • Revision ID: package-import@ubuntu.com-20111223175706-7jtbxxoq8kahg13s
Tags: 4:4.7.90-0ubuntu2
* Fix lintian warning description-contains-duplicated-word.
* Drop all kubuntu patches that were commented out.
* Fix FTBFS on arm* due to qreal/double mismatch.
  - Add kubuntu_fix_qreal_float.diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/icontasks/taskitemlayout.cpp
369
369
    }
370
370
 
371
371
    QRectF groupRect(m_groupItem->boundingRect());
372
 
    qreal cellSize(qMin(m_applet->launcherIcons() || !m_applet->autoIconScaling() ? 272.0 : 80, qMin(groupRect.width(), groupRect.height())));
 
372
    qreal cellSize(qMin(m_applet->launcherIcons() || !m_applet->autoIconScaling() ? qreal(272) : qreal(80), qMin(groupRect.width(), groupRect.height())));
373
373
    QSizeF maximumCellSize(cellSize, cellSize);
374
374
 
375
375
    setHorizontalSpacing(m_applet->spacing());