update module versions to Qt stable (5.1 staging)

jfaust · Mar 31, 2013 · 686c874 · 686c874
1 parent 7db1473
commit 686c874
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 30 deletions.
diff --git 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
@@ -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
diff --git a/qtbase b/qtbase
diff --git a/qtdeclarative b/qtdeclarative
diff --git a/qtdesktopcomponents b/qtdesktopcomponents
diff --git a/qtdesktopcomponents.pro b/qtdesktopcomponents.pro
diff --git a/qtdoc b/qtdoc
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
diff --git a/qtimageformats b/qtimageformats
diff --git a/qtjsbackend b/qtjsbackend
diff --git a/qtmultimedia b/qtmultimedia
diff --git a/qtqa b/qtqa
diff --git a/qtquickcontrols b/qtquickcontrols
diff --git a/qtrepotools b/qtrepotools
diff --git a/qtscript b/qtscript
diff --git a/qtsvg b/qtsvg
diff --git a/qttools b/qttools
diff --git a/qttranslations b/qttranslations
diff --git a/qtwebkit b/qtwebkit
diff --git a/qtxmlpatterns b/qtxmlpatterns
diff --git 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...