diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-18 14:19:05 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-18 13:24:13 +0000 |
| commit | 4794fce4be864b0a2054e4726e0ba4f595332c24 (patch) | |
| tree | 6b48c6d8e284cb29703d21ba68c6847606c8d276 /src/templates/qquickcontrol.cpp | |
| parent | 94e90c78f2cfcc513795113d51ef4773c532a6e1 (diff) | |
Fix build on ARM with -qreal float
Change-Id: Id80ecea7bd79265d731e5c5e37c0acf0e344c8ab
Task-number: QTBUG-50048
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickcontrol.cpp')
| -rw-r--r-- | src/templates/qquickcontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp index bcaeed56..b08b70fb 100644 --- a/src/templates/qquickcontrol.cpp +++ b/src/templates/qquickcontrol.cpp @@ -420,7 +420,7 @@ void QQuickControl::resetFont() */ qreal QQuickControl::availableWidth() const { - return qMax(0.0, width() - leftPadding() - rightPadding()); + return qMax<qreal>(0.0, width() - leftPadding() - rightPadding()); } /*! @@ -432,7 +432,7 @@ qreal QQuickControl::availableWidth() const */ qreal QQuickControl::availableHeight() const { - return qMax(0.0, height() - topPadding() - bottomPadding()); + return qMax<qreal>(0.0, height() - topPadding() - bottomPadding()); } /*! |