1 files changed, 7 insertions, 2 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index 5930b20fb..eac1c0c9b 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -1013,12 +1013,17 @@ QJSValue QDeclarativeCamera::supportedViewfinderResolutions(qreal minimumFrameRa
 
     \since 5.5
 */
-QJSValue QDeclarativeCamera::supportedViewfinderFrameRateRanges(const QSize &resolution)
+QJSValue QDeclarativeCamera::supportedViewfinderFrameRateRanges(const QJSValue &resolution)
 {
     QQmlEngine *engine = qmlEngine(this);
 
     QCameraViewfinderSettings settings;
-    settings.setResolution(resolution);
+    if (!resolution.isUndefined()) {
+        QJSValue width = resolution.property(QStringLiteral("width"));
+        QJSValue height = resolution.property(QStringLiteral("height"));
+        if (width.isNumber() && height.isNumber())
+            settings.setResolution(width.toInt(), height.toInt());
+    }
     QList<QCamera::FrameRateRange> frameRateRanges = m_camera->supportedViewfinderFrameRateRanges(settings);
 
     QJSValue supportedFrameRateRanges = engine->newArray(frameRateRanges.count());