From 8cc8d57392933d815e9ebbfbd85edd37108467e4 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Wed, 11 Dec 2013 12:11:53 +0100 Subject: Fix the build on ARM Change-Id: I5130a10d56cc7c25da0eabf51c3657ef58cebaa7 Reviewed-by: Jocelyn Turcotte --- src/core/qtwebengine_extras.gypi | 2 +- src/webengine/api/qquickwebengineview.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi index f4e8ad113..95c5c5627 100644 --- a/src/core/qtwebengine_extras.gypi +++ b/src/core/qtwebengine_extras.gypi @@ -33,7 +33,7 @@ 'GL_GLEXT_PROTOTYPES', 'EGL_EGLEXT_PROTOTYPES', ], - 'conditions': [ + 'target_conditions': [ ['_type=="shared_library"', { 'ldflags': [ # Tell the linker to prefer symbols within the library before looking outside diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index b7d9a2d7c..e9375148e 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -312,7 +312,7 @@ void QQuickWebEngineViewport::setDevicePixelRatio(qreal devicePixelRatio) { Q_D(QQuickWebEngineView); // Valid range is [1, inf) - devicePixelRatio = qMax(1.0, devicePixelRatio); + devicePixelRatio = qMax(qreal(1.0), devicePixelRatio); if (d->devicePixelRatio == devicePixelRatio) return; d->setDevicePixelRatio(devicePixelRatio); -- cgit v1.2.3