summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-11 12:11:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-11 14:02:42 +0100
commit8cc8d57392933d815e9ebbfbd85edd37108467e4 (patch)
tree09d0d1061179ba2d812c9b2785bad38f1694e155
parentd7c5850b3a4c925608ce41360a16b5cae7c96d94 (diff)
Fix the build on ARM
Change-Id: I5130a10d56cc7c25da0eabf51c3657ef58cebaa7 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r--src/core/qtwebengine_extras.gypi2
-rw-r--r--src/webengine/api/qquickwebengineview.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
index f4e8ad11..95c5c562 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 b7d9a2d7..e9375148 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);