1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for build with -qreal float

Browse Source 
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>
This commit is contained in:
Timur Pocheptsov 2015-07-24 18:05:43 +02:00 committed by Timur Pocheptsov
parent 1e39c712bd
commit 72680ce7e2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/painting/qpdf.cpp
View File

@ -2103,9 +2103,9 @@ int QPdfEnginePrivate::generateLinearGradientShader(const QLinearGradient *gradi
int QPdfEnginePrivate::generateRadialGradientShader(const QRadialGradient *gradient, const QTransform &matrix, bool alpha) int QPdfEnginePrivate::generateRadialGradientShader(const QRadialGradient *gradient, const QTransform &matrix, bool alpha)
{ {
QPointF p1 = gradient->center(); QPointF p1 = gradient->center();
double r1 = gradient->centerRadius(); qreal r1 = gradient->centerRadius();
QPointF p0 = gradient->focalPoint(); QPointF p0 = gradient->focalPoint();
double r0 = gradient->focalRadius(); qreal r0 = gradient->focalRadius();
Q_ASSERT(gradient->coordinateMode() == QGradient::LogicalMode); Q_ASSERT(gradient->coordinateMode() == QGradient::LogicalMode);

2
src/widgets/widgets/qlineedit_p.cpp
View File

@ -343,7 +343,7 @@ void QLineEditIconButton::startOpacityAnimation(qreal endValue)
void QLineEditIconButton::updateCursor() void QLineEditIconButton::updateCursor()
{ {
#ifndef QT_NO_CURSOR #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 #endif
} }