diff --git a/.gitmodules b/.gitmodules
index 0452becb..049387a6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,6 @@
 [submodule "qtdesktopcomponents"]
 	path = qtdesktopcomponents
 	url = git://gitorious.org/qtplayground/qtdesktopcomponents
+[submodule "qtquickcontrols"]
+	path = qtquickcontrols
+	url = git://qt.gitorious.org/qt/qtquickcontrols
diff --git a/qt.pro b/qt.pro
index e6bb8e98..e3362f44 100644
--- a/qt.pro
+++ b/qt.pro
@@ -73,9 +73,9 @@ module_qtgraphicaleffects.subdir = qtgraphicaleffects
 module_qtgraphicaleffects.target = module-qtgraphicaleffects
 module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative
 
-module_qtdesktopcomponents.subdir = qtdesktopcomponents
-module_qtdesktopcomponents.target = module-qtdesktopcomponents
-module_qtdesktopcomponents.depends = module_qtbase module_qtdeclarative
+module_qtquickcontrols.subdir = qtquickcontrols
+module_qtquickcontrols.target = module-qtquickcontrols
+module_qtquickcontrols.depends = module_qtbase module_qtdeclarative
 
 # only qtbase is required to exist. The others may not - but it is the
 # users responsibility to ensure that all needed dependencies exist, or
@@ -131,4 +131,4 @@ exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphical
 exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
 exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
 exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
-exists(qtdesktopcomponents/qtdesktopcomponents.pro): SUBDIRS += module_qtdesktopcomponents
+exists(qtquickcontrols/qtquickcontrols.pro): SUBDIRS += module_qtquickcontrols
diff --git a/qtactiveqt b/qtactiveqt
index b5366d0f..b8169e05 160000
--- a/qtactiveqt
+++ b/qtactiveqt
@@ -1 +1 @@
-Subproject commit b5366d0fa77bf219a26023a463c1b8045c7d306f
+Subproject commit b8169e058a10e44abacd3dd6f3a4432bfdf151e8
diff --git a/qtbase b/qtbase
index 8635494e..219f47c6 160000
--- a/qtbase
+++ b/qtbase
@@ -1 +1 @@
-Subproject commit 8635494ef3e08378b41ff2e71ecbd02b946ff394
+Subproject commit 219f47c6cd762b07ca9b0bba3ef77cd47bea555b
diff --git a/qtdeclarative b/qtdeclarative
index 245bb43c..09e82887 160000
--- a/qtdeclarative
+++ b/qtdeclarative
@@ -1 +1 @@
-Subproject commit 245bb43c64e7464ee2225ac9a003b51fe93f91d7
+Subproject commit 09e82887d37b3381b9c117d8c70109679c04a331
diff --git a/qtdesktopcomponents b/qtdesktopcomponents
deleted file mode 160000
index 35f06168..00000000
--- a/qtdesktopcomponents
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 35f0616883fe96e23f45e6a34aef5b06cbfe6530
diff --git a/qtdesktopcomponents.pro b/qtdesktopcomponents.pro
deleted file mode 100644
index 289b0181..00000000
--- a/qtdesktopcomponents.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qt_parts)
-
-# We need accessibility
-!contains(QT_CONFIG, accessibility) {
-    error("Building Qt without accessibility is not supported for desktop components.")
-}
diff --git a/qtdoc b/qtdoc
index e7435af2..988a8dbe 160000
--- a/qtdoc
+++ b/qtdoc
@@ -1 +1 @@
-Subproject commit e7435af29366e979411130a1aa38179eda5269bc
+Subproject commit 988a8dbe978500b4709ea0baea4d6038abc0f1e0
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
index 5717e881..23a1dc28 160000
--- a/qtgraphicaleffects
+++ b/qtgraphicaleffects
@@ -1 +1 @@
-Subproject commit 5717e881ae7246e3ab2e1df12af73378ebaad824
+Subproject commit 23a1dc28177638fdf64a8accad52dc4dd7e5ba2a
diff --git a/qtimageformats b/qtimageformats
index c8f12586..50731469 160000
--- a/qtimageformats
+++ b/qtimageformats
@@ -1 +1 @@
-Subproject commit c8f1258628657baca02bf0c6b84a4bbfb08251e4
+Subproject commit 50731469be7b7c0ed18768789604e13955a8b2f7
diff --git a/qtjsbackend b/qtjsbackend
index cbd9ec0d..c97afb08 160000
--- a/qtjsbackend
+++ b/qtjsbackend
@@ -1 +1 @@
-Subproject commit cbd9ec0defc2558d32ddfd44fe22c1af9c7a36e7
+Subproject commit c97afb08eb28ce36f726fe427556622790a287c1
diff --git a/qtmultimedia b/qtmultimedia
index 256b1b39..ff8dadd5 160000
--- a/qtmultimedia
+++ b/qtmultimedia
@@ -1 +1 @@
-Subproject commit 256b1b390b2eb898b5296a10b8394cce0d655e24
+Subproject commit ff8dadd5fe34dcc147fe16cd16b756111c7f1b42
diff --git a/qtqa b/qtqa
index b2221fac..898d1ded 160000
--- a/qtqa
+++ b/qtqa
@@ -1 +1 @@
-Subproject commit b2221faca328d173e4cb91b75a4cce90cb5568dd
+Subproject commit 898d1dede297d164a02e8e027fc46242b6005be2
diff --git a/qtquickcontrols b/qtquickcontrols
new file mode 160000
index 00000000..04e8acde
--- /dev/null
+++ b/qtquickcontrols
@@ -0,0 +1 @@
+Subproject commit 04e8acde2fb0776e511255d2bec3ebb04ea122a3
diff --git a/qtrepotools b/qtrepotools
index ef4f1434..5453e0fb 160000
--- a/qtrepotools
+++ b/qtrepotools
@@ -1 +1 @@
-Subproject commit ef4f1434841acb955ecf586b168e83f70d4e9e1c
+Subproject commit 5453e0fb3133cd2e0a10d2b056f5873343a42e6d
diff --git a/qtscript b/qtscript
index 7a09d123..a5116f19 160000
--- a/qtscript
+++ b/qtscript
@@ -1 +1 @@
-Subproject commit 7a09d123cb29129419dea33c4e2ef0217b339a44
+Subproject commit a5116f19e540387fe0653364bbbd9a662bc67b7a
diff --git a/qtsvg b/qtsvg
index 84abe5fc..9c79ef00 160000
--- a/qtsvg
+++ b/qtsvg
@@ -1 +1 @@
-Subproject commit 84abe5fcf2a70de7bf8503641e8617383693882e
+Subproject commit 9c79ef0046c550614964afb8feb734c96853691c
diff --git a/qttools b/qttools
index 9deef17a..7b6a6273 160000
--- a/qttools
+++ b/qttools
@@ -1 +1 @@
-Subproject commit 9deef17ae9c85d8efdbceb515206ac31a4356216
+Subproject commit 7b6a627315f012598dca23d3ff978a09bfba7969
diff --git a/qttranslations b/qttranslations
index ab38e82f..4e896d9e 160000
--- a/qttranslations
+++ b/qttranslations
@@ -1 +1 @@
-Subproject commit ab38e82f91eba27f6343e86d9b4aca96f72322af
+Subproject commit 4e896d9ed32af523e8fb951409bf3cc21b4d5718
diff --git a/qtwebkit b/qtwebkit
index 04e372db..59755c40 160000
--- a/qtwebkit
+++ b/qtwebkit
@@ -1 +1 @@
-Subproject commit 04e372db7917f4b34bcb85feb02acb1024519e87
+Subproject commit 59755c40572bfd6bb7642fc7b348a15665353a92
diff --git a/qtxmlpatterns b/qtxmlpatterns
index c3c83eb1..18d558b4 160000
--- a/qtxmlpatterns
+++ b/qtxmlpatterns
@@ -1 +1 @@
-Subproject commit c3c83eb164c3932a311ad47ef0e1991d0bdc6c0e
+Subproject commit 18d558b4ab505724d0bd93b5f66997c33a601e04
diff --git a/st_build_windows_common.ps1 b/st_build_windows_common.ps1
index 32ea009a..11cfbf4b 100644
--- a/st_build_windows_common.ps1
+++ b/st_build_windows_common.ps1
@@ -17,6 +17,10 @@ if ($osname -eq "win64")
   $icu_bindir = "$(get-location)\icu\bin64"
 }
 
+# Copy the icu dlls to the qtbase bin dir so they're available during the build,
+# which seems to be necessary for Qt 5.1
+cp -Verbose $(ls "$icu_bindir/*.dll") "$(get-location)/qtbase/bin"
+
 # Grab OpenSSL, which is required for https support
 echo "downloading openssl..."
 $webclient.DownloadFile("http://repo.suitabletech.com/downloads/openssl-1.0.1e-$osname.zip", "$(get-location)/openssl.zip")
@@ -42,8 +46,6 @@ if ($LastExitCode -ne 0) { exit $LastExitCode }
 
 echo "copying icu..."
 # Copy ICU dlls into the install dir
-ls "icu/bin/*.dll"
-cp -Verbose $(ls "$icu_bindir/*.dll") "$version/lib"
 cp -Verbose $(ls "$icu_bindir/*.dll") "$version/bin"
 
 ls "$version/lib/*icu*.dll"
@@ -52,7 +54,6 @@ if ($LastExitCode -ne 0) { exit $LastExitCode }
 
 # Copy openssl dlls into the install dir
 echo "copying openssl..."
-cp -Verbose "$(get-location)/openssl/bin/*.dll" "$version/lib"
 cp -Verbose "$(get-location)/openssl/bin/*.dll" "$version/bin"
 
 echo creating tarball...