diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-12-18 09:07:46 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-12-18 09:07:46 (GMT) |
| commit | 0d212670c06ed54ac785e0bb945c792947d388f5 (patch) | |
| tree | c4f6c6762ad42df463f30e05e090fa2cfa9de77a /src/gui/graphicsview/qgridlayoutengine.cpp | |
| parent | 371420d5f31a04b91c01807139d49e97db040bee (diff) | |
| parent | 7c1283fca1ef2e742b5794600e00edf0c3e3020f (diff) | |
| download | Qt-0d212670c06ed54ac785e0bb945c792947d388f5.zip Qt-0d212670c06ed54ac785e0bb945c792947d388f5.tar.gz Qt-0d212670c06ed54ac785e0bb945c792947d388f5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgridlayoutengine.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgridlayoutengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp index f61360a..9497a2f 100644 --- a/src/gui/graphicsview/qgridlayoutengine.cpp +++ b/src/gui/graphicsview/qgridlayoutengine.cpp @@ -51,6 +51,7 @@ #include "qvarlengtharray.h" #include <QtDebug> +#include <QtCore/qmath.h> QT_BEGIN_NAMESPACE @@ -70,7 +71,7 @@ static void insertOrRemoveItems(QVector<T> &items, int index, int delta) static qreal growthFactorBelowPreferredSize(qreal desired, qreal sumAvailable, qreal sumDesired) { Q_ASSERT(sumDesired != 0.0); - return desired * ::pow(sumAvailable / sumDesired, desired / sumDesired); + return desired * qPow(sumAvailable / sumDesired, desired / sumDesired); } static qreal fixedDescent(qreal descent, qreal ascent, qreal targetSize) |