From 475690770757f667e639c4cd5100bd7c5333a6ef Mon Sep 17 00:00:00 2001
From: Josh Faust <jfaust@suitabletech.com>
Date: Wed, 3 Apr 2013 23:27:47 -0700
Subject: [PATCH] another attempt at fixing the windows build for the
 buildserver...

---
 qtdeclarative               | 2 +-
 st_build_windows_common.ps1 | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/qtdeclarative b/qtdeclarative
index 31d6b8c3..02ed0fe6 160000
--- a/qtdeclarative
+++ b/qtdeclarative
@@ -1 +1 @@
-Subproject commit 31d6b8c3ea4e665efb355909501c0a48081b3231
+Subproject commit 02ed0fe64112b24a772a18ef3e9c12339f39ecf0
diff --git a/st_build_windows_common.ps1 b/st_build_windows_common.ps1
index ec914a98..cfc27199 100644
--- a/st_build_windows_common.ps1
+++ b/st_build_windows_common.ps1
@@ -17,10 +17,6 @@ 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")
@@ -34,6 +30,9 @@ echo configuring ...
 
 if ($LastExitCode -ne 0) { exit $LastExitCode }
 
+# Setup PATH to include <qtbase>/lib and <icu>/bin, which seems to be necessary for Qt 5.1
+$env:PATH += ";$(icu_bindir);$(get-location)\qtbase\lib"
+
 echo building...
 nmake