Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	src/qml/compiler/qv4codegen.cpp

Done-With: Erik Verbruggen <erik.verbruggen@qt.io>
Change-Id: I3ae3d64317e4f3fccba6605f4c6da15479ca75e0

4 files changed, 10 insertions, 13 deletions

diff --git a/src/imports/settings/plugin.cpp b/src/imports/settings/plugin.cpp
index 3ac0ad4653..eb7d5027a4 100644
--- a/src/imports/settings/plugin.cpp
+++ b/src/imports/settings/plugin.cpp
@@ -55,7 +55,7 @@ public:
     {
         Q_ASSERT(QByteArray(uri) == QByteArray("Qt.labs.settings"));
         qmlRegisterType<QQmlSettings>(uri, 1, 0, "Settings");
-        qmlRegisterType<QQmlSettings,1>(uri, 1, 1, "Settings");
+        qmlRegisterModule(uri, 1, 1); // QTBUG-73239
     }
 };
 
diff --git a/src/imports/settings/plugins.qmltypes b/src/imports/settings/plugins.qmltypes
index 1d69fcf7e9..3c9685fe10 100644
--- a/src/imports/settings/plugins.qmltypes
+++ b/src/imports/settings/plugins.qmltypes
@@ -20,20 +20,17 @@ Module {
         Property { name: "fileName"; revision: 1; type: "string" }
         Method {
             name: "value"
-            revision: 1
             type: "QVariant"
             Parameter { name: "key"; type: "string" }
             Parameter { name: "defaultValue"; type: "QVariant" }
         }
         Method {
             name: "value"
-            revision: 1
             type: "QVariant"
             Parameter { name: "key"; type: "string" }
         }
         Method {
             name: "setValue"
-            revision: 1
             Parameter { name: "key"; type: "string" }
             Parameter { name: "value"; type: "QVariant" }
         }
diff --git a/src/imports/settings/qqmlsettings.cpp b/src/imports/settings/qqmlsettings.cpp
index 310ef62d9f..f7a7d8b055 100644
--- a/src/imports/settings/qqmlsettings.cpp
+++ b/src/imports/settings/qqmlsettings.cpp
@@ -433,9 +433,9 @@ void QQmlSettings::setCategory(const QString &category)
     This property holds the path to the settings file. If the file doesn't
     already exist, it is created.
 
-    \sa QSettings::fileName, QSettings::IniFormat
+    \since Qt 5.12
 
-    \since Qt.labs.settings 1.1
+    \sa QSettings::fileName, QSettings::IniFormat
 */
 QString QQmlSettings::fileName() const
 {
@@ -460,9 +460,9 @@ void QQmlSettings::setFileName(const QString &fileName)
    Returns the value for setting \a key. If the setting doesn't exist,
    returns \a defaultValue.
 
-   \sa QSettings::value
+   \since Qt 5.12
 
-   \since Qt.labs.settings 1.1
+   \sa QSettings::value
 */
 QVariant QQmlSettings::value(const QString &key, const QVariant &defaultValue) const
 {
@@ -476,9 +476,9 @@ QVariant QQmlSettings::value(const QString &key, const QVariant &defaultValue) c
    Sets the value of setting key to value. If the key already exists,
    the previous value is overwritten.
 
-   \sa QSettings::setValue
+   \since Qt 5.12
 
-   \since Qt.labs.settings 1.1
+   \sa QSettings::setValue
 */
 void QQmlSettings::setValue(const QString &key, const QVariant &value)
 {
diff --git a/src/imports/settings/qqmlsettings_p.h b/src/imports/settings/qqmlsettings_p.h
index f73e595557..f9122a58f7 100644
--- a/src/imports/settings/qqmlsettings_p.h
+++ b/src/imports/settings/qqmlsettings_p.h
@@ -65,7 +65,7 @@ class QQmlSettings : public QObject, public QQmlParserStatus
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(QString category READ category WRITE setCategory FINAL)
-    Q_PROPERTY(QString fileName READ fileName WRITE setFileName FINAL REVISION 1)
+    Q_PROPERTY(QString fileName READ fileName WRITE setFileName FINAL)
 
 public:
     explicit QQmlSettings(QObject *parent = 0);
@@ -77,8 +77,8 @@ public:
     QString fileName() const;
     void setFileName(const QString &fileName);
 
-    Q_REVISION(1) Q_INVOKABLE QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
-    Q_REVISION(1) Q_INVOKABLE void setValue(const QString &key, const QVariant &value);
+    Q_INVOKABLE QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
+    Q_INVOKABLE void setValue(const QString &key, const QVariant &value);
 
 protected:
     void timerEvent(QTimerEvent *event) override;