summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2012-07-03 11:50:07 +0300
committerJason McDonald <jason.mcdonald@nokia.com>2012-07-04 03:04:18 +0200
commitb64b1fa19310753212c2c688a819c8d3a0ac56bc (patch)
tree453f5c7d9e4e3fabc55b523af60324b0f827bd3b
parented86f677957c846b3699e86f982434270ca32ee3 (diff)
Add ICU libraries as a part of the Windows installer
Updated Windows configuration so that ICU libraries will be bundled as a part of the qt5 beta msvc2010 installations, both 32bit and 64bit packages. Change-Id: Ia359be2e8ead24b7813b1df0283b026f120a0fee Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
-rw-r--r--release-tools/configurations/win_x86_beta16
1 files changed, 14 insertions, 2 deletions
diff --git a/release-tools/configurations/win_x86_beta b/release-tools/configurations/win_x86_beta
index 978a425..103345d 100644
--- a/release-tools/configurations/win_x86_beta
+++ b/release-tools/configurations/win_x86_beta
@@ -83,7 +83,7 @@ archive_name: qt-everywhere-opensource-src-5.0.0.7z
[qt.sdk.desktop]
[qt.sdk.desktop.500_beta.msvc2010_64]
-archives: desktop.500_beta.msvc2010_64
+archives: desktop.500_beta.msvc2010_64, icu_49.win_64
target_install_base: /Desktop/Qt/5.0.0-beta/msvc2010_64
version: 5.0.0
version_tag: %QT_VERSION%
@@ -94,9 +94,15 @@ package_strip_dirs: 1
target_install_dir: /
rpath_target:
archive_name: msvc2010_64_all.7z
+[icu_49.win_64]
+archive_uri: http://origin.releases.qt-project.org/prebuilt/icu_49_win_64.7z
+package_strip_dirs: 0
+target_install_dir: /bin
+rpath_target:
+archive_name: icu_49_win_64.7z
[qt.sdk.desktop.500_beta.msvc2010]
-archives: desktop.500_beta.msvc2010
+archives: desktop.500_beta.msvc2010, icu_49.win_32
target_install_base: /Desktop/Qt/5.0.0-beta/msvc2010
version: 5.0.0
version_tag: %QT_VERSION%
@@ -107,4 +113,10 @@ package_strip_dirs: 1
target_install_dir: /
rpath_target:
archive_name: msvc2010_all.7z
+[icu_49.win_32]
+archive_uri: http://origin.releases.qt-project.org/prebuilt/icu_49_win_32.7z
+package_strip_dirs: 0
+target_install_dir: /bin
+rpath_target:
+archive_name: icu_49_win_32.7z