Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandler

We no longer have any hope of getting this into 5.8.

Change-Id: I2decfa47e589ba7ae2d6b951c6517a2c311d0192

15 files changed, 46 insertions, 72 deletions

diff --git a/src/imports/folderlistmodel/fileinfothread_p.h b/src/imports/folderlistmodel/fileinfothread_p.h
index 8a154f264e..56058fd6be 100644
--- a/src/imports/folderlistmodel/fileinfothread_p.h
+++ b/src/imports/folderlistmodel/fileinfothread_p.h
@@ -94,7 +94,7 @@ public Q_SLOTS:
 #endif
 
 protected:
-    void run();
+    void run() override;
     void getFileInfos(const QString &path);
     void findChangeRange(const QList<FileProperty> &list, int &fromIndex, int &toIndex);
 
diff --git a/src/imports/folderlistmodel/fileproperty_p.h b/src/imports/folderlistmodel/fileproperty_p.h
index f385cdfdb4..48be4a3d85 100644
--- a/src/imports/folderlistmodel/fileproperty_p.h
+++ b/src/imports/folderlistmodel/fileproperty_p.h
@@ -57,17 +57,17 @@
 class FileProperty
 {
 public:
-    FileProperty(const QFileInfo &info)
+    FileProperty(const QFileInfo &info) :
+        mFileName(info.fileName()),
+        mFilePath(info.filePath()),
+        mBaseName(info.baseName()),
+        mSuffix(info.completeSuffix()),
+        mSize(info.size()),
+        mIsDir(info.isDir()),
+        mIsFile(info.isFile()),
+        mLastModified(info.lastModified()),
+        mLastRead(info.lastRead())
     {
-        mFileName = info.fileName();
-        mFilePath = info.filePath();
-        mBaseName = info.baseName();
-        mSize = info.size();
-        mSuffix = info.completeSuffix();
-        mIsDir = info.isDir();
-        mIsFile = info.isFile();
-        mLastModified = info.lastModified();
-        mLastRead = info.lastRead();
     }
     ~FileProperty()
     {}
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h
index aae6df452d..dee73dff3e 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.h
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h
@@ -94,10 +94,10 @@ public:
         FileUrlRole = Qt::UserRole + 9
     };
 
-    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    virtual QHash<int, QByteArray> roleNames() const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QHash<int, QByteArray> roleNames() const override;
 //![abslistmodel]
 
 //![count]
@@ -144,8 +144,8 @@ public:
     Q_INVOKABLE int indexOf(const QUrl &file) const;
 
 //![parserstatus]
-    virtual void classBegin();
-    virtual void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 //![parserstatus]
 
     int roleFromString(const QString &roleName) const;
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 28345d049a..7d5596e86e 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -6,9 +6,10 @@ SUBDIRS += \
     folderlistmodel \
     localstorage \
     models \
-    settings \
     statemachine
 
+qtConfig(settings): SUBDIRS += settings
+
 qtHaveModule(quick) {
     SUBDIRS += \
         handlers \
diff --git a/src/imports/layouts/qquickgridlayoutengine_p.h b/src/imports/layouts/qquickgridlayoutengine_p.h
index 86f56a5af4..2810e2e5d0 100644
--- a/src/imports/layouts/qquickgridlayoutengine_p.h
+++ b/src/imports/layouts/qquickgridlayoutengine_p.h
@@ -67,7 +67,7 @@ public:
         : QGridLayoutItem(row, column, rowSpan, columnSpan, alignment), m_item(item), sizeHintCacheDirty(true), useFallbackToWidthOrHeight(true) {}
 
 
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override
     {
         Q_UNUSED(constraint);   // Quick Layouts does not support constraint atm
         return effectiveSizeHints()[which];
@@ -99,12 +99,12 @@ public:
         sizeHintCacheDirty = true;
     }
 
-    QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const
+    QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const override
     {
         return QQuickLayout::effectiveSizePolicy_helper(m_item, orientation, attachedLayoutObject(m_item, false));
     }
 
-    void setGeometry(const QRectF &rect)
+    void setGeometry(const QRectF &rect) override
     {
         QQuickLayoutAttached *info = attachedLayoutObject(m_item, false);
         const QRectF r = info ? rect.marginsRemoved(info->qMargins()) : rect;
diff --git a/src/imports/layouts/qquicklinearlayout.cpp b/src/imports/layouts/qquicklinearlayout.cpp
index fdf8479133..7fad395a29 100644
--- a/src/imports/layouts/qquicklinearlayout.cpp
+++ b/src/imports/layouts/qquicklinearlayout.cpp
@@ -56,15 +56,7 @@
 
     Items in a RowLayout support these attached properties:
     \list
-        \li \l{Layout::minimumWidth}{Layout.minimumWidth}
-        \li \l{Layout::minimumHeight}{Layout.minimumHeight}
-        \li \l{Layout::preferredWidth}{Layout.preferredWidth}
-        \li \l{Layout::preferredHeight}{Layout.preferredHeight}
-        \li \l{Layout::maximumWidth}{Layout.maximumWidth}
-        \li \l{Layout::maximumHeight}{Layout.maximumHeight}
-        \li \l{Layout::fillWidth}{Layout.fillWidth}
-        \li \l{Layout::fillHeight}{Layout.fillHeight}
-        \li \l{Layout::alignment}{Layout.alignment}
+    \input layout.qdocinc attached-properties
     \endlist
 
     \image rowlayout.png
@@ -118,15 +110,7 @@
 
     Items in a ColumnLayout support these attached properties:
     \list
-        \li \l{Layout::minimumWidth}{Layout.minimumWidth}
-        \li \l{Layout::minimumHeight}{Layout.minimumHeight}
-        \li \l{Layout::preferredWidth}{Layout.preferredWidth}
-        \li \l{Layout::preferredHeight}{Layout.preferredHeight}
-        \li \l{Layout::maximumWidth}{Layout.maximumWidth}
-        \li \l{Layout::maximumHeight}{Layout.maximumHeight}
-        \li \l{Layout::fillWidth}{Layout.fillWidth}
-        \li \l{Layout::fillHeight}{Layout.fillHeight}
-        \li \l{Layout::alignment}{Layout.alignment}
+    \input layout.qdocinc attached-properties
     \endlist
 
     \image columnlayout.png
@@ -220,15 +204,7 @@
         \li \l{Layout::column}{Layout.column}
         \li \l{Layout::rowSpan}{Layout.rowSpan}
         \li \l{Layout::columnSpan}{Layout.columnSpan}
-        \li \l{Layout::minimumWidth}{Layout.minimumWidth}
-        \li \l{Layout::minimumHeight}{Layout.minimumHeight}
-        \li \l{Layout::preferredWidth}{Layout.preferredWidth}
-        \li \l{Layout::preferredHeight}{Layout.preferredHeight}
-        \li \l{Layout::maximumWidth}{Layout.maximumWidth}
-        \li \l{Layout::maximumHeight}{Layout.maximumHeight}
-        \li \l{Layout::fillWidth}{Layout.fillWidth}
-        \li \l{Layout::fillHeight}{Layout.fillHeight}
-        \li \l{Layout::alignment}{Layout.alignment}
+        \input layout.qdocinc attached-properties
     \endlist
 
     Read more about attached properties \l{QML Object Attributes}{here}.
diff --git a/src/imports/layouts/qquicklinearlayout_p.h b/src/imports/layouts/qquicklinearlayout_p.h
index 86404f8d79..ca8b867824 100644
--- a/src/imports/layouts/qquicklinearlayout_p.h
+++ b/src/imports/layouts/qquicklinearlayout_p.h
@@ -158,7 +158,7 @@ public:
     Flow flow() const;
     void setFlow(Flow flow);
 
-    void insertLayoutItems();
+    void insertLayoutItems() override;
 
 signals:
     void columnSpacingChanged();
@@ -200,7 +200,7 @@ public:
     qreal spacing() const;
     void setSpacing(qreal spacing);
 
-    void insertLayoutItems();
+    void insertLayoutItems() override;
 
 signals:
     void spacingChanged();
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index bf70fd1050..b8fd307215 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -794,7 +794,7 @@ public:
     }
     void registerTypes(const char *uri) Q_DECL_OVERRIDE
     {
-        Q_ASSERT(QLatin1String(uri) == "QtQuick.LocalStorage");
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.LocalStorage"));
         qmlRegisterSingletonType<QQuickLocalStorage>(uri, 2, 0, "LocalStorage", module_api_factory);
     }
 };
diff --git a/src/imports/settings/qqmlsettings_p.h b/src/imports/settings/qqmlsettings_p.h
index 0ed55579dd..ce942d7564 100644
--- a/src/imports/settings/qqmlsettings_p.h
+++ b/src/imports/settings/qqmlsettings_p.h
@@ -74,10 +74,10 @@ public:
     void setCategory(const QString &category);
 
 protected:
-    void timerEvent(QTimerEvent *event);
+    void timerEvent(QTimerEvent *event) override;
 
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
 private:
     Q_DISABLE_COPY(QQmlSettings)
diff --git a/src/imports/settings/settings.pro b/src/imports/settings/settings.pro
index 3d7c9c31b8..29229f59cb 100644
--- a/src/imports/settings/settings.pro
+++ b/src/imports/settings/settings.pro
@@ -1,6 +1,3 @@
-load(qfeatures)
-requires(!contains(QT_DISABLED_FEATURES, settings))
-
 CXX_MODULE = qml
 TARGET  = qmlsettingsplugin
 TARGETPATH = Qt/labs/settings
diff --git a/src/imports/statemachine/state.h b/src/imports/statemachine/state.h
index 73e4ecda6b..8e8cefab19 100644
--- a/src/imports/statemachine/state.h
+++ b/src/imports/statemachine/state.h
@@ -58,8 +58,8 @@ class State : public QState, public QQmlParserStatus
 public:
     explicit State(QState *parent = 0);
 
-    void classBegin() {}
-    void componentComplete();
+    void classBegin() override {}
+    void componentComplete() override;
 
     QQmlListProperty<QObject> children();
 
diff --git a/src/imports/statemachine/statemachine.h b/src/imports/statemachine/statemachine.h
index 59a810f387..cb0ab43f8b 100644
--- a/src/imports/statemachine/statemachine.h
+++ b/src/imports/statemachine/statemachine.h
@@ -62,8 +62,8 @@ class StateMachine : public QStateMachine, public QQmlParserStatus
 public:
     explicit StateMachine(QObject *parent = 0);
 
-    void classBegin() {}
-    void componentComplete();
+    void classBegin() override {}
+    void componentComplete() override;
     QQmlListProperty<QObject> children();
 
     bool isRunning() const;
diff --git a/src/imports/statemachine/timeouttransition.h b/src/imports/statemachine/timeouttransition.h
index 5d71e86bb4..0e5f5377e3 100644
--- a/src/imports/statemachine/timeouttransition.h
+++ b/src/imports/statemachine/timeouttransition.h
@@ -59,8 +59,8 @@ public:
     int timeout() const;
     void setTimeout(int timeout);
 
-    void classBegin() {}
-    void componentComplete();
+    void classBegin() override {}
+    void componentComplete() override;
 
 Q_SIGNALS:
     void timeoutChanged();
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index 6e9e57a046..4306f477e9 100644
--- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
@@ -176,7 +176,7 @@ public:
     QQuickXmlQueryThreadObject(QQuickXmlQueryEngine *);
 
     void processJobs();
-    virtual bool event(QEvent *e);
+    bool event(QEvent *e) override;
 
 private:
     QQuickXmlQueryEngine *m_queryEngine;
@@ -202,7 +202,7 @@ signals:
     void error(void*, const QString&);
 
 protected:
-    void run();
+    void run() override;
 
 private:
     void processQuery(XmlQueryJob *job);
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h
index f0096a9125..3a4487a085 100644
--- a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h
@@ -95,10 +95,10 @@ public:
     QQuickXmlListModel(QObject *parent = 0);
     ~QQuickXmlListModel();
 
-    QModelIndex index(int row, int column, const QModelIndex &parent) const;
-    int rowCount(const QModelIndex &parent) const;
-    QVariant data(const QModelIndex &index, int role) const;
-    QHash<int, QByteArray> roleNames() const;
+    QModelIndex index(int row, int column, const QModelIndex &parent) const override;
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QHash<int, QByteArray> roleNames() const override;
 
     int count() const;
 
@@ -124,8 +124,8 @@ public:
 
     Q_INVOKABLE QString errorString() const;
 
-    virtual void classBegin();
-    virtual void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
 Q_SIGNALS:
     void statusChanged(QQuickXmlListModel::Status);
@@ -194,7 +194,7 @@ public:
         Q_EMIT isKeyChanged();
     }
 
-    bool isValid() {
+    bool isValid() const {
         return !m_name.isEmpty() && !m_query.isEmpty();
     }