6 files changed, 12 insertions, 13 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
index 1ac3779..c932ec2 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
@@ -2723,7 +2723,7 @@ static HB_Error  Load_Mark2Array( HB_Mark2Array*  m2a,
 {
   HB_Error  error;
 
-  HB_UShort        k, m, n, count;
+  HB_UShort        m, n, count;
   HB_UInt          cur_offset, new_offset, base_offset;
 
   HB_Mark2Record  *m2r;
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp
index beafe72..3a43ec7 100644
--- a/src/corelib/io/qfsfileengine.cpp
+++ b/src/corelib/io/qfsfileengine.cpp
@@ -44,6 +44,7 @@
 #include "qdatetime.h"
 #include "qdiriterator.h"
 #include "qset.h"
+#include <QtCore/qdebug.h>
 
 #ifndef QT_NO_FSFILEENGINE
 
@@ -571,7 +572,7 @@ bool QFSFileEnginePrivate::seekFdFh(qint64 pos)
     } else {
         // Unbuffered stdio mode.
         if (QT_LSEEK(fd, pos, SEEK_SET) == -1) {
-            qWarning("QFile::at: Cannot set file position %lld", pos);
+            qWarning() << "QFile::at: Cannot set file position" << pos;
             q->setError(QFile::PositionError, qt_error_string(errno));
             return false;
         }
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 91266db..6d9daec 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -430,16 +430,15 @@ int QMetaType::registerType(const char *typeName, Destructor destructor,
 #endif
 
     QWriteLocker locker(customTypesLock());
-    static int currentIdx = User;
     int idx = qMetaTypeType_unlocked(normalizedTypeName);
 
     if (!idx) {
-        idx = currentIdx++;
-        ct->resize(ct->count() + 1);
-        QCustomTypeInfo &inf = (*ct)[idx - User];
+        QCustomTypeInfo inf;
         inf.typeName = normalizedTypeName;
         inf.constr = constructor;
         inf.destr = destructor;
+        idx = ct->size() + User;
+        ct->append(inf);
     }
     return idx;
 }
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index d43be3e..1e502ff 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -1488,9 +1488,8 @@ int QRegExpEngine::anchorAlternation(int a, int b)
         return Anchor_Alternation | (n - 1);
 #endif
 
-    aa.resize(n + 1);
-    aa[n].a = a;
-    aa[n].b = b;
+    QRegExpAnchorAlternation element = {a, b};
+    aa.append(element);
     return Anchor_Alternation | n;
 }
 
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 80c2e24..b97ba45 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -6473,7 +6473,7 @@ QString QString::arg(qlonglong a, int fieldWidth, int base, const QChar &fillCha
     ArgEscapeData d = findArgEscapes(*this);
 
     if (d.occurrences == 0) {
-        qWarning("QString::arg: Argument missing: %s, %lld", toLocal8Bit().data(), a);
+        qWarning() << "QString::arg: Argument missing:" << *this << ',' << a;
         return *this;
     }
 
@@ -6516,7 +6516,7 @@ QString QString::arg(qulonglong a, int fieldWidth, int base, const QChar &fillCh
     ArgEscapeData d = findArgEscapes(*this);
 
     if (d.occurrences == 0) {
-        qWarning("QString::arg: Argument missing: %s, %llu", toLocal8Bit().data(), a);
+        qWarning() << "QString::arg: Argument missing:" << *this << ',' << a;
         return *this;
     }
 
diff --git a/src/gui/dialogs/qpagesetupdialog_win.cpp b/src/gui/dialogs/qpagesetupdialog_win.cpp
index a84a7ce..3f2fb34 100644
--- a/src/gui/dialogs/qpagesetupdialog_win.cpp
+++ b/src/gui/dialogs/qpagesetupdialog_win.cpp
@@ -78,8 +78,8 @@ int QPageSetupDialog::exec()
     psd.lStructSize = sizeof(PAGESETUPDLG);
 
     // we need a temp DEVMODE struct if we don't have a global DEVMODE
-    HGLOBAL hDevMode;
-    int devModeSize;
+    HGLOBAL hDevMode = 0;
+    int devModeSize = 0;
     if (!ep->globalDevMode) {
         devModeSize = sizeof(DEVMODE) + ep->devMode->dmDriverExtra;
         hDevMode = GlobalAlloc(GHND, devModeSize);