diff options
| -rw-r--r-- | .commit-template | 2 | ||||
| -rw-r--r-- | .gitmodules | 58 | ||||
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | README.git | 4 | ||||
| -rwxr-xr-x | init-repository | 48 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtandroidextras | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtenginio | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtqa | 0 | ||||
| m--------- | qtquick1 | 0 | ||||
| m--------- | qtquickcontrols | 0 | ||||
| m--------- | qtrepotools | 0 | ||||
| m--------- | qtscript | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtserialport | 0 | ||||
| m--------- | qtsvg | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qttranslations | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebchannel | 0 | ||||
| m--------- | qtwebengine | 0 | ||||
| m--------- | qtwebkit | 0 | ||||
| m--------- | qtwebkit-examples | 0 | ||||
| m--------- | qtwebsockets | 0 | ||||
| m--------- | qtwinextras | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
36 files changed, 67 insertions, 53 deletions
diff --git a/.commit-template b/.commit-template index 3edc08db..26441ac5 100644 --- a/.commit-template +++ b/.commit-template @@ -14,7 +14,7 @@ # # ==[ Please wrap at 72 characters ]===================================| # -# Remember to read http://wiki.qt-project.org/Commit_Policy +# Remember to read http://wiki.qt.io/Commit_Policy # # Change log entry: If this commit adds a significant feature, fixes an # issue or contains a behavior change that is relevant to others, diff --git a/.gitmodules b/.gitmodules index e2f848f5..a184119b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,52 +1,52 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtsvg"] path = qtsvg url = ../qtsvg.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtdeclarative"] path = qtdeclarative url = ../qtdeclarative.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtactiveqt"] path = qtactiveqt url = ../qtactiveqt.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtscript"] path = qtscript url = ../qtscript.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtmultimedia"] path = qtmultimedia url = ../qtmultimedia.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qttools"] path = qttools url = ../qttools.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtxmlpatterns"] path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qttranslations"] path = qttranslations url = ../qttranslations.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtdoc"] path = qtdoc url = ../qtdoc.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtrepotools"] path = qtrepotools @@ -56,12 +56,12 @@ [submodule "qtwebkit"] path = qtwebkit url = ../qtwebkit.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtwebkit-examples"] path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtqa"] path = qtqa @@ -71,12 +71,12 @@ [submodule "qtlocation"] path = qtlocation url = ../qtlocation.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtsensors"] path = qtsensors url = ../qtsensors.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtsystems"] path = qtsystems @@ -97,12 +97,12 @@ [submodule "qtconnectivity"] path = qtconnectivity url = ../qtconnectivity.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtwayland"] path = qtwayland url = ../qtwayland.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qt3d"] path = qt3d @@ -111,65 +111,65 @@ [submodule "qtimageformats"] path = qtimageformats url = ../qtimageformats.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtquick1"] path = qtquick1 url = ../qtquick1.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtgraphicaleffects"] path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtquickcontrols"] path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtserialport"] path = qtserialport url = ../qtserialport.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtx11extras"] path = qtx11extras url = ../qtx11extras.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtmacextras"] path = qtmacextras url = ../qtmacextras.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtwinextras"] path = qtwinextras url = ../qtwinextras.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtandroidextras"] path = qtandroidextras url = ../qtandroidextras.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtenginio"] path = qtenginio url = ../qtenginio.git - branch = 1.1.1 + branch = 1.1 initrepo = true [submodule "qtwebsockets"] path = qtwebsockets url = ../qtwebsockets.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtwebchannel"] path = qtwebchannel url = ../qtwebchannel.git - branch = 5.4.1 + branch = 5.4 initrepo = true [submodule "qtwebengine"] path = qtwebengine url = ../qtwebengine.git - branch = 5.4.1 + branch = 5.4 initrepo = true @@ -14,7 +14,7 @@ HOW TO BUILD QT5 For other platform specific requirements, please see section "Setting up your machine" on: - http://qt-project.org/wiki/Get_The_Source + http://wiki.qt.io/Get_The_Source Optional requirements --------------------- @@ -119,9 +119,9 @@ HOW TO BUILD QT5 Building Qt5 from git ===================== - See http://qt-project.org/wiki/Building-Qt-5-from-Git and README.git + See http://wiki.qt.io/Building_Qt_5_from_Git and README.git for more information. - See http://qt-project.org/wiki/Qt-5 for the reference platforms. + See http://wiki.qt.io/Qt_5 for the reference platforms. Documentation @@ -139,6 +139,6 @@ HOW TO BUILD QT5 Running "qmake -query" will list the value of QT_INSTALL_DOCS. Information about Qt 5's documentation is located in qtbase/doc/README - or in the following page: http://qt-project.org/wiki/Qt5DocumentationProject + or in the following page: http://wiki.qt.io/Qt5DocumentationProject Note: Building the documentation is only tested on desktop platforms. @@ -5,7 +5,7 @@ OBTAINING QT5 FROM GIT ======== For a more in-depth description on how to build Qt5 from git, - please see: http://qt-project.org/wiki/Building-Qt-5-from-Git + please see: http://wiki.qt.io/Building_Qt_5_from_Git Get The Submodules @@ -52,4 +52,4 @@ OBTAINING QT5 FROM GIT ================================ For more information on how to develop and contribute to Qt, please see: - http://qt-project.org/wiki/Category:Developing_Qt + http://wiki.qt.io/Category:Developing_Qt diff --git a/init-repository b/init-repository index 9844f38c..581d108e 100755 --- a/init-repository +++ b/init-repository @@ -383,21 +383,10 @@ sub git_clone_all_submodules } foreach my $module (@modules) { - $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}); + $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}, $subbranches{$module}); } - if ($self->{update}) { - $self->exe('git', 'submodule', 'update', ($co_branch ? ('--remote', '--rebase') : ())); - - foreach my $module (@modules) { - if (-f $module.'/.gitmodules') { - my $orig_cwd = getcwd(); - chdir($module) or confess "chdir $module: $OS_ERROR"; - $self->git_clone_all_submodules($subbases{$module}, 0, "all"); - chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR"; - } - } - } elsif ($co_branch) { + if ($co_branch) { foreach my $module (@modules) { my $branch = $subbranches{$module}; die("No branch defined for submodule $module.\n") if (!defined($branch)); @@ -412,6 +401,20 @@ sub git_clone_all_submodules chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR"; } } + if ($self->{update}) { + my @cmd = ('git', 'submodule', 'update', '--no-fetch'); + push @cmd, '--remote', '--rebase' if ($co_branch); + $self->exe(@cmd); + + foreach my $module (@modules) { + if (-f $module.'/.gitmodules') { + my $orig_cwd = getcwd(); + chdir($module) or confess "chdir $module: $OS_ERROR"; + $self->git_clone_all_submodules($subbases{$module}, 0, "all"); + chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR"; + } + } + } return; } @@ -437,7 +440,7 @@ sub git_add_remotes sub git_clone_one_submodule { - my ($self, $submodule, $repo_basename) = @_; + my ($self, $submodule, $repo_basename, $branch) = @_; my $alternates = $self->{ 'alternates' }; my $mirror_url = $self->{ 'mirror-url' }; @@ -473,20 +476,31 @@ sub git_clone_one_submodule my $do_clone = (! -e "$submodule/.git"); if ($do_clone) { - $self->exe('git', 'clone', @reference_args, ($mirror ? $mirror : $url), $submodule); + push @reference_args, '--branch', $branch if ($branch); + $self->exe('git', 'clone', @reference_args, + ($mirror ? $mirror : $url), $submodule); } my $orig_cwd = getcwd(); chdir($submodule) or confess "chdir $submodule: $OS_ERROR"; - $self->exe('git', 'config', 'remote.origin.url', $url); if ($mirror) { + # This is only for the user's convenience - we make no use of it. $self->exe('git', 'config', 'remote.mirror.url', $mirror); $self->exe('git', 'config', 'remote.mirror.fetch', '+refs/heads/*:refs/remotes/mirror/*'); } if (!$do_clone && $self->{update}) { - $self->exe('git', 'fetch', ($mirror ? $mirror : $url)); + # If we didn't clone, fetch from the right location. We always update + # the origin remote, so that submodule update --remote works. + $self->exe('git', 'config', 'remote.origin.url', ($mirror ? $mirror : $url)); + $self->exe('git', 'fetch', 'origin'); + } + + if (!($do_clone || $self->{update}) || $mirror) { + # Leave the origin configured to the canonical URL. It's already correct + # if we cloned/fetched without a mirror; otherwise it may be anything. + $self->exe('git', 'config', 'remote.origin.url', $url); } my $template = getcwd()."/../.commit-template"; diff --git a/qtactiveqt b/qtactiveqt -Subproject 23fefdce7b6198b176e204316611f0d3596f635 +Subproject e4ad73d62709de02f12c643e01a4285d375ec03 diff --git a/qtandroidextras b/qtandroidextras -Subproject 030a9c9a0d00bf15ea632d956c9c84535774dfe +Subproject 42b878b16157fdbe9fb0254459536f00abb194b diff --git a/qtbase b/qtbase -Subproject 69196b38c481610ef30bfe8ce8e7ba6826729ab +Subproject 50c41bc8efb52b2b3f2aad66d79167320e9b2b3 diff --git a/qtconnectivity b/qtconnectivity -Subproject 9cc6a9b3af559004bbfdfec3aa7dd258bee1eb7 +Subproject aa00047183008edd739df472cf0490e9fffbe65 diff --git a/qtdeclarative b/qtdeclarative -Subproject aebdf4649934e65bdab94d799da5afb2da145a3 +Subproject 2fdb6eba0a58b629db32f9eefec2f26df08d3d2 diff --git a/qtdoc b/qtdoc -Subproject 6c4215658a40e761b9869e9c4c206966282dba9 +Subproject 0c932e61428f8076c46dd10d4ccc486970b0445 diff --git a/qtenginio b/qtenginio -Subproject 37e40d3ae296ed8a4ad4f2a641c984897316671 +Subproject 134dc76b7ff5152364f830b577e223b35056083 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject caaf216efb1494e06340632e86bd04c5db759b6 +Subproject c7ed28bece292e2745e02663ef519c76d16ec76 diff --git a/qtimageformats b/qtimageformats -Subproject 2cf398f541d68f60e0205820524b79b37045bf0 +Subproject ec301681e4e2f5b293435ec7cf295350ee5acb1 diff --git a/qtlocation b/qtlocation -Subproject 72217c530ee588f7e0f6eeacea407a1b49592b7 +Subproject 3678bc8b3e128bf244ae263a44576a40b72e587 diff --git a/qtmacextras b/qtmacextras -Subproject 4f432b26b489b07545cada1c5c92266238a214d +Subproject 0b5793251af8c8a9355a01ee277df8ab99aaac7 diff --git a/qtmultimedia b/qtmultimedia -Subproject 6b6cb2121f1ec56ba710a9b57ace3ee74aebe4f +Subproject cc0569a038f6116df559508518b6dacb15be852 diff --git a/qtqa b/qtqa -Subproject ce0fb0372651a46d064af959e2801b2d7ab65ba +Subproject 96360b96af893d11204d3592dc2e65a2f2f5325 diff --git a/qtquick1 b/qtquick1 -Subproject bc0cbee60cc309bef5e5359254f798942f67692 +Subproject ba0708a75784a92aee9523b7ee925ece18c6981 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject daa01c6130b27aad5b59f99727761688f9b509f +Subproject 093312f5f306db8fcb1028f62bd3061aa63ef73 diff --git a/qtrepotools b/qtrepotools -Subproject cbddd3a5a6c9022b456c0df0ae8cf30eddb8cde +Subproject 590f651476265a01ea6f3d14b1607838c08e7cc diff --git a/qtscript b/qtscript -Subproject 52e775b4d0e59dfb44c22b070f272dbc2101438 +Subproject eb08742e8f874b8dab209c1cfe840c534c68ca3 diff --git a/qtsensors b/qtsensors -Subproject 2abe02fb8dd6b33eb5f891789217bf9de283331 +Subproject 40e5aff5318701b31e712cc352483b227f61a6a diff --git a/qtserialport b/qtserialport -Subproject 5a05fb7b63b6e3a89ab6d4ea8a7795ecdb95748 +Subproject e257bdc9aae5583b187bafb5e69e4a6143e3bf4 diff --git a/qtsvg b/qtsvg -Subproject d6357e11474284ddfdb2e860d9661bdf0290ec9 +Subproject ccae23961e65b81b3c16a45d4e186e1e5657a2f diff --git a/qttools b/qttools -Subproject e8efb8f55d9ef0f1cfbbf6c50a71a3aada017f7 +Subproject a6ed9b418d1b4464f088b378e5bdb96ec420db6 diff --git a/qttranslations b/qttranslations -Subproject 28db19a305159b18479fc35ab225dd771323991 +Subproject f76e5c98b0c426ffed95443e45041c3c0deab0c diff --git a/qtwayland b/qtwayland -Subproject 23bb7cad3166eedcd528da2d3c35377b506f80c +Subproject 182488129c3f6a67a7e781fdb7c014777719199 diff --git a/qtwebchannel b/qtwebchannel -Subproject 616a5ea6ea99882de7e65c80b362699742448b7 +Subproject 7b5da1d3dd561bc871e7ab4bf8644d33f60d579 diff --git a/qtwebengine b/qtwebengine -Subproject 72ff0b7d9600db642e2d2e95c78c70454bbdb5e +Subproject 55a7fc7651136510032166ff24eb5e7e4963514 diff --git a/qtwebkit b/qtwebkit -Subproject 383587d4f7200f7ee551a5f71fb0ce145a0ae25 +Subproject 9cbcd93cfe0ba6f7531574f7784e8978bd72311 diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject e4076871cd815b7e7e79886c01cffce81d9e699 +Subproject 9f20ed0b48f4e5adcc9558b2cc4171eb17f243d diff --git a/qtwebsockets b/qtwebsockets -Subproject 5f8093e6f985a7a887ffaa1e2fecd7314b5444c +Subproject 0002e934391ace7b77665a227068c3e06d57677 diff --git a/qtwinextras b/qtwinextras -Subproject e57ba2b4c0f412eb70b90b7801af6881a8e185f +Subproject 339afd9ccb6ee764f9a1a210658e2dded45bf60 diff --git a/qtx11extras b/qtx11extras -Subproject ffeff89b8497d42ed2a786053a9a14775f77f78 +Subproject 32b1ce9e1b1542f6779abcbcd78613b15149aaa diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 060cc3c47062a35e8127413ece57573d1aca067 +Subproject c21924d67a8ef39282afdf3ae6fef798dfca713 |