diff options
-rw-r--r-- | src/imports/multimedia/multimedia.cpp | 28 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamerafocus.cpp | 10 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamerafocus_p.h | 1 |
3 files changed, 21 insertions, 18 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index e63eecc49..f9170f790 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -92,17 +92,17 @@ public: qmlRegisterType<QDeclarativeCamera>(uri, 5, 0, "Camera"); qmlRegisterType<QDeclarativeTorch>(uri, 5, 0, "Torch"); qmlRegisterUncreatableType<QDeclarativeCameraCapture>(uri, 5, 0, "CameraCapture", - trUtf8("CameraCapture is provided by Camera")); + tr("CameraCapture is provided by Camera")); qmlRegisterUncreatableType<QDeclarativeCameraRecorder>(uri, 5, 0, "CameraRecorder", - trUtf8("CameraRecorder is provided by Camera")); + tr("CameraRecorder is provided by Camera")); qmlRegisterUncreatableType<QDeclarativeCameraExposure>(uri, 5, 0, "CameraExposure", - trUtf8("CameraExposure is provided by Camera")); + tr("CameraExposure is provided by Camera")); qmlRegisterUncreatableType<QDeclarativeCameraFocus>(uri, 5, 0, "CameraFocus", - trUtf8("CameraFocus is provided by Camera")); + tr("CameraFocus is provided by Camera")); qmlRegisterUncreatableType<QDeclarativeCameraFlash>(uri, 5, 0, "CameraFlash", - trUtf8("CameraFlash is provided by Camera")); + tr("CameraFlash is provided by Camera")); qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing>(uri, 5, 0, "CameraImageProcessing", - trUtf8("CameraImageProcessing is provided by Camera")); + tr("CameraImageProcessing is provided by Camera")); // 5.2 types qmlRegisterType<QDeclarativeVideoOutput, 2>(uri, 5, 2, "VideoOutput"); @@ -116,10 +116,10 @@ public: qmlRegisterSingletonType<QDeclarativeMultimediaGlobal>(uri, 5, 4, "QtMultimedia", multimedia_global_object); qmlRegisterType<QDeclarativeCamera, 1>(uri, 5, 4, "Camera"); qmlRegisterUncreatableType<QDeclarativeCameraViewfinder>(uri, 5, 4, "CameraViewfinder", - trUtf8("CameraViewfinder is provided by Camera")); + tr("CameraViewfinder is provided by Camera")); // 5.5 types - qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 1>(uri, 5, 5, "CameraImageProcessing", trUtf8("CameraImageProcessing is provided by Camera")); + qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 1>(uri, 5, 5, "CameraImageProcessing", tr("CameraImageProcessing is provided by Camera")); qmlRegisterType<QDeclarativeCamera, 2>(uri, 5, 5, "Camera"); // 5.6 types @@ -131,7 +131,7 @@ public: // 5.7 types qmlRegisterType<QDeclarativePlaylist, 1>(uri, 5, 7, "Playlist"); qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 2>(uri, 5, 7, "CameraImageProcessing", - trUtf8("CameraImageProcessing is provided by Camera")); + tr("CameraImageProcessing is provided by Camera")); // 5.8 types (nothing new, re-register one of the types) qmlRegisterType<QSoundEffect>(uri, 5, 8, "SoundEffect"); @@ -140,19 +140,19 @@ public: qmlRegisterType<QDeclarativeAudio, 2>(uri, 5, 9, "Audio"); qmlRegisterType<QDeclarativeAudio, 2>(uri, 5, 9, "MediaPlayer"); qmlRegisterUncreatableType<QDeclarativeCameraCapture, 1>(uri, 5, 9, "CameraCapture", - trUtf8("CameraCapture is provided by Camera")); + tr("CameraCapture is provided by Camera")); qmlRegisterUncreatableType<QDeclarativeCameraFlash, 1>(uri, 5, 9, "CameraFlash", - trUtf8("CameraFlash is provided by Camera")); + tr("CameraFlash is provided by Camera")); // 5.11 types qmlRegisterType<QDeclarativeAudio, 3>(uri, 5, 11, "Audio"); qmlRegisterType<QDeclarativeAudio, 3>(uri, 5, 11, "MediaPlayer"); qmlRegisterUncreatableType<QDeclarativeCameraFocus, 1>(uri, 5, 11, "CameraFocus", - trUtf8("CameraFocus is provided by Camera")); + tr("CameraFocus is provided by Camera")); qmlRegisterUncreatableType<QDeclarativeCameraExposure, 1>(uri, 5, 11, "CameraExposure", - trUtf8("CameraExposure is provided by Camera")); + tr("CameraExposure is provided by Camera")); qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 3>(uri, 5, 11, "CameraImageProcessing", - trUtf8("CameraImageProcessing is provided by Camera")); + tr("CameraImageProcessing is provided by Camera")); qmlRegisterType<QDeclarativeMediaMetaData>(); qmlRegisterType<QAbstractVideoFilter>(); diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp index 1dd216467..61c22c066 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus.cpp +++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp @@ -397,10 +397,6 @@ void QDeclarativeCameraFocus::updateFocusZones() FocusZonesModel::FocusZonesModel(QObject *parent) :QAbstractListModel(parent) { - QHash<int, QByteArray> roles; - roles[StatusRole] = "status"; - roles[AreaRole] = "area"; - setRoleNames(roles); } int FocusZonesModel::rowCount(const QModelIndex &parent) const @@ -427,6 +423,12 @@ QVariant FocusZonesModel::data(const QModelIndex &index, int role) const return QVariant(); } +QHash<int,QByteArray> FocusZonesModel::roleNames() const +{ + return {{StatusRole, QByteArrayLiteral("status")}, + {AreaRole, QByteArrayLiteral("area")}}; +} + void FocusZonesModel::setFocusZones(const QCameraFocusZoneList &zones) { beginResetModel(); diff --git a/src/imports/multimedia/qdeclarativecamerafocus_p.h b/src/imports/multimedia/qdeclarativecamerafocus_p.h index e3a1c28b7..bd5d54d48 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus_p.h +++ b/src/imports/multimedia/qdeclarativecamerafocus_p.h @@ -145,6 +145,7 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QHash<int,QByteArray> roleNames() const override; public slots: void setFocusZones(const QCameraFocusZoneList &zones); |