10 files changed, 32 insertions, 3 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 100edc2d98..c0b5682446 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -8,6 +8,8 @@ isEmpty(QMAKE_EXT_CPP_MOC):QMAKE_EXT_CPP_MOC = .moc
 MOC_INCLUDEPATH =
 for (inc, INCLUDEPATH): \
     MOC_INCLUDEPATH += $$absolute_path($$inc, $$_PRO_FILE_PWD_)
+!no_include_pwd:!isEqual(OUT_PWD, $$_PRO_FILE_PWD_): \
+    MOC_INCLUDEPATH += .
 MOC_INCLUDEPATH = $$QMAKESPEC $$_PRO_FILE_PWD_ $$MOC_INCLUDEPATH $$QMAKE_DEFAULT_INCDIRS
 
 # On Windows, put the includes into a .inc file which moc will read, if the project
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 83a8778654..fb83e59e65 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -172,6 +172,8 @@ contains(QT_CONFIG, static) {
             else: \
                 QTPLUGIN += $$QT_DEFAULT_QPA_PLUGIN
         }
+        needs_printsupport_plugin: \
+                QTPLUGIN += $$QT_DEFAULT_PRINTSUPPORTPLUGIN
         import_plugins:!isEmpty(QTPLUGIN) {
             IMPORT_FILE_CONT = \
                 "// This file is autogenerated by qmake. It imports static plugin classes for" \
diff --git a/mkspecs/features/win32/windeployqt.prf b/mkspecs/features/win32/windeployqt.prf
new file mode 100644
index 0000000000..f49df47ffe
--- /dev/null
+++ b/mkspecs/features/win32/windeployqt.prf
@@ -0,0 +1,19 @@
+# Extra target for running windeployqt
+qtPrepareTool(QMAKE_WINDEPLOYQT, windeployqt)
+build_pass {
+    load(resolve_target)
+
+    isEmpty(WINDEPLOYQT_OPTIONS): WINDEPLOYQT_OPTIONS = -qmldir $$shell_quote($$shell_path($$_PRO_FILE_PWD_))
+    WINDEPLOYQT_TARGET = $$shell_quote($$shell_path($$QMAKE_RESOLVED_TARGET))
+    WINDEPLOYQT_OUTPUT = $$shell_quote($$shell_path($$dirname(QMAKE_RESOLVED_TARGET)/$$basename(TARGET).windeployqt))
+    windeployqt.target = windeployqt
+    windeployqt.commands = $$QMAKE_WINDEPLOYQT $$WINDEPLOYQT_OPTIONS -list target $$WINDEPLOYQT_TARGET > $$WINDEPLOYQT_OUTPUT
+
+    windeployqt_clean.commands = if exist $$WINDEPLOYQT_OUTPUT for /f %i in ($$WINDEPLOYQT_OUTPUT) do $$QMAKE_DEL_FILE %~fi && $$QMAKE_DEL_DIR %~pi
+    QMAKE_EXTRA_TARGETS += windeployqt_clean
+    DISTCLEAN_DEPS += windeployqt_clean
+    QMAKE_DISTCLEAN += $$WINDEPLOYQT_OUTPUT
+} else {
+    windeployqt.CONFIG += recursive
+}
+QMAKE_EXTRA_TARGETS += windeployqt
diff --git a/mkspecs/winphone-x86-msvc2012/qmake.conf b/mkspecs/winphone-x86-msvc2012/qmake.conf
index 1329370900..4b8a92ea3b 100644
--- a/mkspecs/winphone-x86-msvc2012/qmake.conf
+++ b/mkspecs/winphone-x86-msvc2012/qmake.conf
@@ -13,7 +13,7 @@ QMAKE_LFLAGS           += /MACHINE:X86
 
 QMAKE_LIBS             += WindowsPhoneCore.lib PhoneAppModelHost.lib ws2_32.lib
 
-VCPROJ_ARCH             = x86
+VCPROJ_ARCH             = Win32
 MSVC_VER                = 11.0
 WINSDK_VER              = 8.0
 WINTARGET_VER           = WP80
diff --git a/mkspecs/winrt-arm-msvc2012/qmake.conf b/mkspecs/winrt-arm-msvc2012/qmake.conf
index 41594a3547..b2603cfb2f 100644
--- a/mkspecs/winrt-arm-msvc2012/qmake.conf
+++ b/mkspecs/winrt-arm-msvc2012/qmake.conf
@@ -17,3 +17,4 @@ MSVC_VER                = 11.0
 WINSDK_VER              = 8.0
 WINTARGET_VER           = win8
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = arm
diff --git a/mkspecs/winrt-arm-msvc2013/qmake.conf b/mkspecs/winrt-arm-msvc2013/qmake.conf
index 83ab228d7f..d1ab60723d 100644
--- a/mkspecs/winrt-arm-msvc2013/qmake.conf
+++ b/mkspecs/winrt-arm-msvc2013/qmake.conf
@@ -19,3 +19,4 @@ MSVC_VER                = 12.0
 WINSDK_VER              = 8.1
 WINTARGET_VER           = winv6.3
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = arm
diff --git a/mkspecs/winrt-x64-msvc2012/qmake.conf b/mkspecs/winrt-x64-msvc2012/qmake.conf
index f6e360ae12..a0c64c695f 100644
--- a/mkspecs/winrt-x64-msvc2012/qmake.conf
+++ b/mkspecs/winrt-x64-msvc2012/qmake.conf
@@ -17,3 +17,4 @@ MSVC_VER                = 11.0
 WINSDK_VER              = 8.0
 WINTARGET_VER           = win8
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = x64
diff --git a/mkspecs/winrt-x64-msvc2013/qmake.conf b/mkspecs/winrt-x64-msvc2013/qmake.conf
index 2c01450ed4..594d0dafd0 100644
--- a/mkspecs/winrt-x64-msvc2013/qmake.conf
+++ b/mkspecs/winrt-x64-msvc2013/qmake.conf
@@ -19,3 +19,4 @@ MSVC_VER                = 12.0
 WINSDK_VER              = 8.1
 WINTARGET_VER           = winv6.3
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = x64
diff --git a/mkspecs/winrt-x86-msvc2012/qmake.conf b/mkspecs/winrt-x86-msvc2012/qmake.conf
index 664212624c..6e6ea4664d 100644
--- a/mkspecs/winrt-x86-msvc2012/qmake.conf
+++ b/mkspecs/winrt-x86-msvc2012/qmake.conf
@@ -12,8 +12,9 @@ QMAKE_LFLAGS           += /SAFESEH /MACHINE:X86
 
 QMAKE_LIBS             += windowscodecs.lib kernel32.lib ole32.lib
 
-VCPROJ_ARCH             = x86
+VCPROJ_ARCH             = Win32
 MSVC_VER                = 11.0
 WINSDK_VER              = 8.0
 WINTARGET_VER           = win8
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = x86
diff --git a/mkspecs/winrt-x86-msvc2013/qmake.conf b/mkspecs/winrt-x86-msvc2013/qmake.conf
index 384b51a1e6..77b906c7d3 100644
--- a/mkspecs/winrt-x86-msvc2013/qmake.conf
+++ b/mkspecs/winrt-x86-msvc2013/qmake.conf
@@ -14,8 +14,9 @@ QMAKE_LFLAGS           += /SAFESEH /MACHINE:X86
 
 QMAKE_LIBS             += windowscodecs.lib kernel32.lib ole32.lib
 
-VCPROJ_ARCH             = x86
+VCPROJ_ARCH             = Win32
 MSVC_VER                = 12.0
 WINSDK_VER              = 8.1
 WINTARGET_VER           = winv6.3
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = x86