11 files changed, 13 insertions, 19 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 506e9deb19..6ab40c6765 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -24,10 +24,8 @@ LINKER            = link
 CFLAGS_EXTRA      = /MP /wd4577 $(CFLAGS_CRT)
 !endif  # !win32-icc
 
-!if "$(QMAKESPEC)" != "win32-clang-msvc"
 CFLAGS_PCH        = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch
 PCH_OBJECT        = qmake_pch.obj
-!endif
 
 CFLAGS_BARE = -c -Fo./ -Fdqmake.pdb \
               -W2 -nologo -O2 \
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 8ebd0c61ce..f9159ccd75 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -27,7 +27,6 @@
 ****************************************************************************/
 
 #include "metamakefile.h"
-#include "qregexp.h"
 #include "qdir.h"
 #include "qdebug.h"
 #include "makefile.h"
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 7f42fbe09e..836737e77d 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -28,7 +28,6 @@
 
 #include "unixmake.h"
 #include "option.h"
-#include <qregexp.h>
 #include <qfile.h>
 #include <qhash.h>
 #include <qdir.h>
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 08a8c2168d..3116238aa0 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -34,6 +34,7 @@
 #include <qscopedpointer.h>
 #include <qstringlist.h>
 #include <qfileinfo.h>
+#include <qregexp.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 15c8838054..45f23e52bd 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -34,6 +34,7 @@
 
 #include <qscopedpointer.h>
 #include <qfileinfo.h>
+#include <qregexp.h>
 
 using namespace QMakeInternal;
 
diff --git a/qmake/library/ioutils.cpp b/qmake/library/ioutils.cpp
index 3e49a99cd5..d2171274d8 100644
--- a/qmake/library/ioutils.cpp
+++ b/qmake/library/ioutils.cpp
@@ -30,6 +30,7 @@
 
 #include <qdir.h>
 #include <qfile.h>
+#include <qregexp.h>
 
 #ifdef Q_OS_WIN
 #  include <windows.h>
diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h
index 71e5e05367..6882f2802f 100644
--- a/qmake/library/proitems.h
+++ b/qmake/library/proitems.h
@@ -429,7 +429,7 @@ class ProFunctionDef {
 public:
     ProFunctionDef(ProFile *pro, int offset) : m_pro(pro), m_offset(offset) { m_pro->ref(); }
     ProFunctionDef(const ProFunctionDef &o) : m_pro(o.m_pro), m_offset(o.m_offset) { m_pro->ref(); }
-    ProFunctionDef(ProFunctionDef &&other) Q_DECL_NOTHROW
+    ProFunctionDef(ProFunctionDef &&other) noexcept
         : m_pro(other.m_pro), m_offset(other.m_offset) { other.m_pro = nullptr; }
     ~ProFunctionDef() { m_pro->deref(); }
     ProFunctionDef &operator=(const ProFunctionDef &o)
@@ -442,13 +442,13 @@ public:
         }
         return *this;
     }
-    ProFunctionDef &operator=(ProFunctionDef &&other) Q_DECL_NOTHROW
+    ProFunctionDef &operator=(ProFunctionDef &&other) noexcept
     {
         ProFunctionDef moved(std::move(other));
         swap(moved);
         return *this;
     }
-    void swap(ProFunctionDef &other) Q_DECL_NOTHROW
+    void swap(ProFunctionDef &other) noexcept
     {
         qSwap(m_pro, other.m_pro);
         qSwap(m_offset, other.m_offset);
diff --git a/qmake/library/qmakebuiltins.cpp b/qmake/library/qmakebuiltins.cpp
index dd7766c8e0..3c4e509fc6 100644
--- a/qmake/library/qmakebuiltins.cpp
+++ b/qmake/library/qmakebuiltins.cpp
@@ -882,8 +882,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
         ret += values(map(args.at(0)));
         break;
     case E_LIST: {
-        QString tmp;
-        tmp.sprintf(".QMAKE_INTERNAL_TMP_variableName_%d", m_listCount++);
+        QString tmp(QString::asprintf(".QMAKE_INTERNAL_TMP_variableName_%d", m_listCount++));
         ret = ProStringList(ProString(tmp));
         ProStringList lst;
         for (const ProString &arg : args)
diff --git a/qmake/library/qmakeevaluator_p.h b/qmake/library/qmakeevaluator_p.h
index f888bc5765..da83ff0de2 100644
--- a/qmake/library/qmakeevaluator_p.h
+++ b/qmake/library/qmakeevaluator_p.h
@@ -31,8 +31,6 @@
 
 #include "proitems.h"
 
-#include <qregexp.h>
-
 #define debugMsg if (!m_debugLevel) {} else debugMsgInternal
 #define traceMsg if (!m_debugLevel) {} else traceMsgInternal
 #ifdef PROEVALUATOR_DEBUG
diff --git a/qmake/library/qmakeglobals.cpp b/qmake/library/qmakeglobals.cpp
index daf4707779..1d76cecc45 100644
--- a/qmake/library/qmakeglobals.cpp
+++ b/qmake/library/qmakeglobals.cpp
@@ -38,7 +38,6 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlist.h>
-#include <qregexp.h>
 #include <qset.h>
 #include <qstack.h>
 #include <qstring.h>
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index 5399e8c298..6a6116c8db 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -96,7 +96,7 @@ HEADERS += \
 bp = $$shadowed(..)
 INCLUDEPATH += \
     $$bp/include $$bp/include/QtCore \
-    $$bp/include/QtCore/$$QT_VERSION $$bp/include/QtCore/$$QT_VERSION/QtCore
+    $$bp/include/QtCore/$$QT_VERSION $$bp/include/QtCore/$$QT_VERSION/QtCore \
     $$bp/src/corelib/global
 
 VPATH += \
@@ -182,18 +182,17 @@ HEADERS += \
     qglobal.h \
     qhash.h \
     qiodevice.h \
-    qjson.h \
+    qjson_p.h \
     qjsonarray.h \
     qjsondocument.h \
     qjsonobject.h \
-    qjsonparser.h \
+    qjsonparser_p.h \
     qjsonvalue.h \
-    qjsonwriter.h \
+    qjsonwriter_p.h \
     qlinkedlist.h \
     qlist.h \
     qlocale.h \
     qlocale_tools_p.h \
-    qmalloc.h \
     qmap.h \
     qmetatype.h \
     qnumeric.h \
@@ -204,12 +203,12 @@ HEADERS += \
     qsystemerror_p.h \
     qtemporaryfile.h \
     qtextstream.h \
-    qutfcodec.h \
+    qutfcodec_p.h \
     quuid.h \
     qvector.h \
     qversionnumber.h \
     qxmlstream.h \
-    qxmlutils.h
+    qxmlutils_p.h
 
 unix {
     SOURCES += \