Fix mixed-type usage of qFuzzyCompare
When building Qt with a non-double qreal type, i.e. QT_COORD_TYPE=float, mixing types on qFuzzyCompare will result in ambiguities since only qFuzzyCompare(float, float) qFuzzyCompare(double, double) are accepted. Pick-to: 6.9 6.8 Change-Id: I4450516ffdf019ef8288aefd99a8e729c039bcd1 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
parent
b0dec15d2d
commit
d693a06522
@ -296,7 +296,7 @@ void QAndroidPlatformWindow::applicationStateChanged(Qt::ApplicationState)
|
||||
void QAndroidPlatformWindow::createSurface()
|
||||
{
|
||||
const bool windowStaysOnTop = bool(window()->flags() & Qt::WindowStaysOnTopHint);
|
||||
const bool isOpaque = !format().hasAlpha() && qFuzzyCompare(window()->opacity(), 1.0);
|
||||
const bool isOpaque = !format().hasAlpha() && qFuzzyCompare(window()->opacity(), qreal(1.0));
|
||||
|
||||
m_nativeQtWindow.callMethod<void>("createSurface", windowStaysOnTop, 32, isOpaque,
|
||||
m_surfaceContainerType);
|
||||
|
Loading…
x
Reference in New Issue
Block a user