Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	.qmake.conf
	tests/auto/controls/data/tst_combobox.qml

Change-Id: I8471cdac4397f77a8e58140d58c6b50d3c437928

2 files changed, 2 insertions, 2 deletions

diff --git a/src/imports/calendar/qquickweeknumbermodel.cpp b/src/imports/calendar/qquickweeknumbermodel.cpp
index c45d8938..8144fb12 100644
--- a/src/imports/calendar/qquickweeknumbermodel.cpp
+++ b/src/imports/calendar/qquickweeknumbermodel.cpp
@@ -46,7 +46,7 @@ class QQuickWeekNumberModelPrivate : public QAbstractItemModelPrivate
     Q_DECLARE_PUBLIC(QQuickWeekNumberModel)
 
 public:
-    QQuickWeekNumberModelPrivate() : month(-1), year(-1)
+    QQuickWeekNumberModelPrivate() : month(-1), year(-1), weekNumbers{}
     {
         QDate date = QDate::currentDate();
         init(date.month(), date.year(), locale);
diff --git a/src/imports/controls/imagine/qquickimaginestyle.cpp b/src/imports/controls/imagine/qquickimaginestyle.cpp
index 9e1431de..745bef10 100644
--- a/src/imports/controls/imagine/qquickimaginestyle.cpp
+++ b/src/imports/controls/imagine/qquickimaginestyle.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC_WITH_ARGS(QString, GlobalPath, (QLatin1String("qrc:/qt-project.org/imports/QtQuick/Controls.2/Imagine/images/")))
 
-static const QString ensureSlash(const QString &path)
+static QString ensureSlash(const QString &path)
 {
     const QChar slash = QLatin1Char('/');
     return path.endsWith(slash) ? path : path + slash;