Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	src/quicktemplates2/qquickabstractbutton_p_p.h
	src/quicktemplates2/qquickcombobox.cpp
	src/quicktemplates2/qquickcontainer.cpp
	src/quicktemplates2/qquickcontrol.cpp
	src/quicktemplates2/qquickcontrol_p_p.h
	src/quicktemplates2/qquickdialog_p_p.h
	src/quicktemplates2/qquickdialogbuttonbox.cpp
	src/quicktemplates2/qquickdialogbuttonbox_p_p.h
	src/quicktemplates2/qquickdrawer.cpp
	src/quicktemplates2/qquickmenubar.cpp
	src/quicktemplates2/qquickmenubar_p_p.h
	src/quicktemplates2/qquickpage.cpp
	src/quicktemplates2/qquickpage_p_p.h
	src/quicktemplates2/qquickpane.cpp
	src/quicktemplates2/qquickpane_p_p.h
	src/quicktemplates2/qquickpopup.cpp
	src/quicktemplates2/qquickpopup_p_p.h
	src/quicktemplates2/qquickrangeslider.cpp
	src/quicktemplates2/qquickscrollview.cpp
	src/quicktemplates2/qquickslider.cpp
	src/quicktemplates2/qquickspinbox.cpp
	src/quicktemplates2/qquickswipeview.cpp
	src/quicktemplates2/qquicktabbar.cpp
	src/quicktemplates2/qquicktextarea_p_p.h
	src/quicktemplates2/qquicktextfield_p_p.h
	src/quicktemplates2/qquicktheme_p.h

Change-Id: I6e2b8fe99e51e3e26c87546aa66af045bc429ec4

4 files changed, 5 insertions, 8 deletions

diff --git a/src/imports/controls/imagine/qquickimageselector.cpp b/src/imports/controls/imagine/qquickimageselector.cpp
index 1b3e80a9..67d3a24b 100644
--- a/src/imports/controls/imagine/qquickimageselector.cpp
+++ b/src/imports/controls/imagine/qquickimageselector.cpp
@@ -106,9 +106,7 @@ static QString findFile(const QDir &dir, const QString &baseName, const QStringL
 
 QQuickImageSelector::QQuickImageSelector(QObject *parent)
     : QObject(parent),
-      m_cache(cacheSize() > 0),
-      m_complete(false),
-      m_separator(QLatin1String("-"))
+      m_cache(cacheSize() > 0)
 {
 }
 
diff --git a/src/imports/controls/imagine/qquickimageselector_p.h b/src/imports/controls/imagine/qquickimageselector_p.h
index 2bb4e526..d050707d 100644
--- a/src/imports/controls/imagine/qquickimageselector_p.h
+++ b/src/imports/controls/imagine/qquickimageselector_p.h
@@ -110,12 +110,12 @@ protected:
     int calculateScore(const QStringList &states) const;
 
 private:
-    bool m_cache;
-    bool m_complete;
+    bool m_cache = false;
+    bool m_complete = false;
     QUrl m_source;
     QString m_path;
     QString m_name;
-    QString m_separator;
+    QString m_separator = QLatin1String("-");
     QVariantList m_allStates;
     QStringList m_activeStates;
     QQmlProperty m_property;
diff --git a/src/imports/controls/imagine/qquickimaginestyle.cpp b/src/imports/controls/imagine/qquickimaginestyle.cpp
index 7617fbf5..9e1431de 100644
--- a/src/imports/controls/imagine/qquickimaginestyle.cpp
+++ b/src/imports/controls/imagine/qquickimaginestyle.cpp
@@ -51,7 +51,6 @@ static const QString ensureSlash(const QString &path)
 
 QQuickImagineStyle::QQuickImagineStyle(QObject *parent)
     : QQuickAttachedObject(parent),
-      m_explicitPath(false),
       m_path(*GlobalPath())
 {
     init();
diff --git a/src/imports/controls/imagine/qquickimaginestyle_p.h b/src/imports/controls/imagine/qquickimaginestyle_p.h
index 88b92c00..20a4baf0 100644
--- a/src/imports/controls/imagine/qquickimaginestyle_p.h
+++ b/src/imports/controls/imagine/qquickimaginestyle_p.h
@@ -82,7 +82,7 @@ protected:
 private:
     void init();
 
-    bool m_explicitPath;
+    bool m_explicitPath = false;
     QString m_path;
 };