summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-06-09 18:30:32 +0200
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-06-11 05:16:23 +0000
commit7f9beeaf9c1f86268dee8e6f668fbf78313ffd9c (patch)
tree6b35adfa5f694ceddd6e32a357f4e6b0ffa80666 /src/imports/multimedia
parentf93f4e3daab1f9cbebbf663f1119a080cb299b9f (diff)
Define QCamera::FrameRateRange as a struct.
Instead of an alias for QPair<qreal, qreal>. Task-number: QTBUG-46563 Change-Id: I7e1ac68242810f7e5f7e161571a11f5de7850e29 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/imports/multimedia')
-rw-r--r--src/imports/multimedia/qdeclarativecamera.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index aac873b8e..c5d899e98 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -1094,8 +1094,8 @@ QJSValue QDeclarativeCamera::supportedViewfinderFrameRateRanges(const QSize &res
int i = 0;
Q_FOREACH (const QCamera::FrameRateRange &frameRateRange, frameRateRanges) {
QJSValue range = engine->newObject();
- range.setProperty(QStringLiteral("minimumFrameRate"), frameRateRange.first);
- range.setProperty(QStringLiteral("maximumFrameRate"), frameRateRange.second);
+ range.setProperty(QStringLiteral("minimumFrameRate"), frameRateRange.minimumFrameRate);
+ range.setProperty(QStringLiteral("maximumFrameRate"), frameRateRange.maximumFrameRate);
supportedFrameRateRanges.setProperty(i++, range);
}