diff options
author | Matti Paaso <matti.paaso@theqtcompany.com> | 2015-02-24 09:19:30 +0200 |
---|---|---|
committer | Matti Paaso <matti.paaso@theqtcompany.com> | 2015-02-24 09:21:52 +0200 |
commit | f3d6306a501e466dbdc0697ee8b003af7d1050e3 (patch) | |
tree | efa709b029e0c34ba3d6597d8d5def794931b91b /packaging-tools/mkqt5bld.py | |
parent | d576aef53742dc825fa75055031baf40814abe84 (diff) | |
parent | ed5345761f7be49cc07672391d00bd807558e876 (diff) |
Merge branch 'master' into refactor
Conflicts:
packaging-tools/releases/release-55
Change-Id: Ie6e0d6a9ed755a129a36dd3ec9e7f1fd28472e28
Diffstat (limited to 'packaging-tools/mkqt5bld.py')
-rw-r--r-- | packaging-tools/mkqt5bld.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging-tools/mkqt5bld.py b/packaging-tools/mkqt5bld.py index 5722c2702..5a43648a8 100644 --- a/packaging-tools/mkqt5bld.py +++ b/packaging-tools/mkqt5bld.py @@ -919,7 +919,7 @@ def setup_option_parser(): help="patch RPath with relative paths pointing to /lib") OPTION_PARSER.add_option("--icu", action="store", type="string", dest="icu_uri", default="", - help="use the given icu for qt5 build, e.g. --icu=http://master.qt-project.org/development_releases/prebuilt/icu/prebuilt/ubuntu1110/icu_51_1_ubuntu_11_10_64_devel.7z") + help="use the given icu for qt5 build, e.g. --icu=http://download.qt.io/development_releases/prebuilt/icu/prebuilt/ubuntu1110/icu_51_1_ubuntu_11_10_64_devel.7z") OPTION_PARSER.add_option("--runtime-path", action="store", type="string", dest="runtime_path", default="", help="use the given dynamic runtime path for qt5 build (-R for configure), e.g. --runtime-path=/home/user/my/path/here") |