diff options
| author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2015-07-24 18:05:43 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2015-08-04 15:37:43 +0000 |
| commit | 72680ce7e2e32222078178596bf3793e6e848a36 (patch) | |
| tree | 8e7e262433d9c8ef14c09129d3e97f13f3b184b7 | |
| parent | 1e39c712bd726e9ef426ecc316edad58d134decf (diff) | |
Fix for build with -qreal float
Resolve ambiguity with function calls (due to double->float conversion),
use qreal where needed intead of explicit 'double'.
Change-Id: I28f1fb4a2b424b1399fb082a36ba9cff666f7c62
Task-number: QTBUG-47433
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| -rw-r--r-- | src/gui/painting/qpdf.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/widgets/qlineedit_p.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 7fa2e5bf09..9f1fc31466 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -2103,9 +2103,9 @@ int QPdfEnginePrivate::generateLinearGradientShader(const QLinearGradient *gradi int QPdfEnginePrivate::generateRadialGradientShader(const QRadialGradient *gradient, const QTransform &matrix, bool alpha) { QPointF p1 = gradient->center(); - double r1 = gradient->centerRadius(); + qreal r1 = gradient->centerRadius(); QPointF p0 = gradient->focalPoint(); - double r0 = gradient->focalRadius(); + qreal r0 = gradient->focalRadius(); Q_ASSERT(gradient->coordinateMode() == QGradient::LogicalMode); diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index ad3a92d35a..b798bca4d1 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -343,7 +343,7 @@ void QLineEditIconButton::startOpacityAnimation(qreal endValue) void QLineEditIconButton::updateCursor() { #ifndef QT_NO_CURSOR - setCursor(qFuzzyCompare(m_opacity, 1.0) || !parentWidget() ? QCursor(Qt::ArrowCursor) : parentWidget()->cursor()); + setCursor(qFuzzyCompare(m_opacity, qreal(1.0)) || !parentWidget() ? QCursor(Qt::ArrowCursor) : parentWidget()->cursor()); #endif } |