Updated submodules.

Change-Id: I95817eeedab667ab8616e9d29837b9cbd6e00a87
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>

.commit-template

@@ -4,15 +4,27 @@
 # ==[ Details: Describe what changed and explain why it changed ]======|
 
 
+# Change log entry (see below for instructions).
+#[ChangeLog][][]
+
 # ==[ Footers: Uncomment and edit where applicable ]===================|
 #
 # One task per entry. Remember space after colon.
 #Task-number: 
 #
-# Solicit reviewers. They still need to use the Gerrit frontend.
-#Reviewed-by: 
-
 # ==[ Please wrap at 72 characters ]===================================|
 #
 # Remember to read http://wiki.qt-project.org/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,
+# add a change log entry. It can be multiple lines long and ends with an
+# empty newline. Try to integrate it into the flow of the commit message
+# to avoid redundancy.
+# Use the module name to indicate the area of the change e.g. [QtCore].
+# Optionally specify a class or subtopic [QtNetwork][QSslSocket].
+# Other common tags are: [General], [Important Behavior Changes],
+# [Platform Specific Changes][Windows][OS X][Linux/XCB].
+#
+# [ChangeLog][module][class/topic] description of the really important
+# change that was just made on several lines.

.gitignore

@@ -1,2 +1,3 @@
 Makefile
 .qmake.cache
+.qmake.super

.gitmodules

@@ -28,9 +28,6 @@
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
-[submodule "qlalr"]
-	path = qlalr
-	url = ../qlalr.git
 [submodule "qtrepotools"]
 	path = qtrepotools
 	url = ../qtrepotools.git
@@ -73,9 +70,6 @@
 [submodule "qt3d"]
 	path = qt3d
 	url = ../qt3d.git
-[submodule "qtjsbackend"]
-	path = qtjsbackend
-	url = ../qtjsbackend.git
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
@@ -94,3 +88,18 @@
 [submodule "qtx11extras"]
 	path = qtx11extras
 	url = ../qtx11extras.git
+[submodule "qtmacextras"]
+	path = qtmacextras
+	url = ../qtmacextras.git
+[submodule "qtwinextras"]
+	path = qtwinextras
+	url = ../qtwinextras.git
+[submodule "qtandroidextras"]
+	path = qtandroidextras
+	url = ../qtandroidextras.git
+[submodule "qtenginio"]
+	path = qtenginio
+	url = ../qtenginio.git
+[submodule "qtwebsockets"]
+	path = qtwebsockets
+	url = ../qtwebsockets.git

README

@@ -127,12 +127,13 @@ HOW TO BUILD QT5
  Documentation
  =============
 
- After the configure step, building the documentation is possible by running
+ After configuring and compiling Qt, building the documentation is possible by running
  "make docs".
- Example:
 
-    ./configure -prefix $PWD/qtbase -opensource
+ After having built the documentation, you need to install it with the following
-    make docs
+ command:
+
+    make install_docs
 
  The documentation is installed in the path set to $QT_INSTALL_DOCS.
  Running "qmake -query" will list the value of QT_INSTALL_DOCS.

configure

@@ -53,11 +53,5 @@ mkdir -p qtbase || exit
 echo "+ cd qtbase"
 cd qtbase || exit
 
-echo "+ $configure $@"
+echo "+ $configure -top-level $@"
-"$configure" "$@" || exit 1
+exec "$configure" -top-level "$@"
-
-echo "+ cd .."
-cd ..
-
-echo "+ qtbase/bin/qmake $srcpath"
-exec qtbase/bin/qmake "$srcpath"

configure.bat

@@ -52,17 +52,10 @@ if not exist qtbase mkdir qtbase || exit /b 1
 echo + cd qtbase
 cd qtbase || exit /b 1
 
-echo + %configure% %*
+echo + %configure% -top-level %*
-call %configure% %*
+call %configure% -top-level %*
 set err=%errorlevel%
 
 cd ..
 
-if not %err% == 0 goto out
-
-echo + qtbase\bin\qmake %srcpath%
-qtbase\bin\qmake %srcpath%
-set err=%errorlevel%
-
-:out
 exit /b %err%

init-repository

@@ -70,6 +70,12 @@ B<Global options:>
 Force initialization (even if the submodules are already checked out).
 
 
+=item --force-hooks
+
+Force initialization of hooks (even if there are already hooks in checked out
+submodules).
+
+
 =item --quiet, -q
 
 Be quiet.  Will exit cleanly if the repository is already initialized.
@@ -104,8 +110,6 @@ Skip the `git submodule update' command.
 Set git config to ignore submodules by default when doing operations on the
 qt5 repo, such as `pull', `fetch', `diff' etc.
 
-This option is default for --nokia-developer.
-
 After using this option, pass `--ignore-submodules=none' to git to override
 it as needed.
 
@@ -116,24 +120,15 @@ B<Repository options:>
 
 =over
 
-=item --nokia-developer
-
-Switch to internal Nokia URLs.
-
-
 =item --berlin
 
-Switch to internal Nokia URLs and make use of the Berlin git mirrors.
+Switch to internal URLs and make use of the Berlin git mirrors.
 (Implies `--mirror').
 
+=item --oslo
 
-=item --ssh
+Switch to internal URLs and make use of the Oslo git mirrors.
-
+(Implies `--mirror').
-Use the SSH protocol for git operations.  This may be useful if the git
-protocol is blocked by a firewall. Note that this requires a user account
-with an uploaded SSH key on all servers used.  (Implies `--nokia-developer').
-
-The `--ssh' option does not affect the gerrit remotes.
 
 
 =item --http
@@ -205,27 +200,26 @@ use Pod::Usage   qw( pod2usage           );
 use Cwd          qw( getcwd              );
 
 my %PROTOCOLS = (
-    'internal'  => 'git://scm.dev.nokia.troll.no/' ,
-    'ssh'       => 'git@scm.dev.nokia.troll.no:'   ,
     'http'      => 'http://git.gitorious.org/'     ,
 );
 
 my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qt3d
     qt5
-    qlalr
     qtactiveqt
+    qtandroidextras
     qtbase
     qtconnectivity
     qtdeclarative
     qtdoc
     qtdocgallery
+    qtenginio
     qtfeedback
     qtgraphicaleffects
     qtimageformats
     qtjsondb
-    qtjsbackend
     qtlocation
+    qtmacextras
     qtmultimedia
     qtpim
     qtqa
@@ -242,22 +236,28 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtwayland
     qtwebkit
     qtwebkit-examples
+    qtwebsockets
+    qtwinextras
     qtx11extras
     qtxmlpatterns
 );
 
 my @DEFAULT_REPOS = qw(
     qtactiveqt
+    qtandroidextras
     qtbase
+    qtconnectivity
     qtdeclarative
     qtdoc
+    qtenginio
     qtgraphicaleffects
     qtimageformats
-    qtjsbackend
+    qtmacextras
     qtmultimedia
     qtqa
     qtquick1
     qtquickcontrols
+    qtlocation
     qtrepotools
     qtscript
     qtsensors
@@ -265,8 +265,10 @@ my @DEFAULT_REPOS = qw(
     qtsvg
     qttools
     qttranslations
+    qtwebsockets
     qtwebkit
     qtwebkit-examples
+    qtwinextras
     qtx11extras
     qtxmlpatterns
 );
@@ -275,7 +277,10 @@ my $GERRIT_SSH_BASE
     = 'ssh://@USER@codereview.qt-project.org@PORT@/';
 
 my $BER_MIRROR_URL_BASE
-    = 'git://ber-git.europe.nokia.com/';
+    = 'git://hegel/';
+
+my $OSLO_MIRROR_URL_BASE
+    = 'git://qilin/';
 
 sub new
 {
@@ -313,9 +318,9 @@ sub parse_arguments
         'codereview-username' => "",
         'detach-alternates'   => 0 ,
         'force'               => 0 ,
+        'force-hooks'         => 0 ,
         'ignore-submodules'   => 0 ,
         'mirror-url'          => "",
-        'nokia-developer'     => 0 ,
         'protocol'            => "",
         'update'              => 1 ,
         'webkit'              => 1 ,
@@ -326,10 +331,10 @@ sub parse_arguments
         'alternates=s'      =>  \$self->{qw{ alternates        }},
         'codereview-username=s' => \$self->{qw{ codereview-username }},
         'copy-objects'      =>  \$self->{qw{ detach-alternates }},
-        'force'             =>  \$self->{qw{ force             }},
+        'force|f'           =>  \$self->{qw{ force             }},
+        'force-hooks'       =>  \$self->{qw{ force-hooks       }},
         'ignore-submodules' =>  \$self->{qw{ ignore-submodules }},
         'mirror=s'          =>  \$self->{qw{ mirror-url        }},
-        'nokia-developer'   =>  \$self->{qw{ nokia-developer   }},
         'quiet'             =>  \$self->{qw{ quiet             }},
         'update!'           =>  \$self->{qw{ update            }},
         'webkit!'           =>  \$self->{qw{ webkit            }},
@@ -337,26 +342,15 @@ sub parse_arguments
 
         'help|?'            =>  sub { pod2usage(1);               },
         'http'              =>  sub { $self->{protocol} = 'http'; },
-        'ssh|ssh-protocol'  =>  sub { $self->{protocol} = 'ssh';  },
 
-        'berlin|berlin-nokia-developer' => sub {
+        'berlin' => sub {
-            $self->{'nokia-developer'}   = 1;
-            $self->{'protocol'}          = 'internal';
             $self->{'mirror-url'}        = $BER_MIRROR_URL_BASE;
         },
-
+        'oslo' => sub {
-        'nokia-developer' => sub {
+            $self->{'mirror-url'}        = $OSLO_MIRROR_URL_BASE;
-            $self->{'nokia-developer'}   = 1;
-            $self->{'protocol'}          = 'internal';
-            $self->{'ignore-submodules'} = 1;
         },
     ) || pod2usage(2);
 
-    if ($self->{'nokia-developer'} && $self->{'protocol'} eq 'http') {
-        print "*** Ignoring use of HTTP protocol, as it's only usable with external server\n";
-        $self->{'protocol'} = '';
-    }
-
     # Replace any double trailing slashes from end of mirror
     $self->{'mirror-url'} =~ s{//+$}{/};
 
@@ -455,12 +449,7 @@ sub git_set_submodule_config
         my $value = $2;
 
         if ($protocol) {
-                # qt-labs projects are still hosted under qt internally.
+                # rewrite URL to chosen protocol
-                if ($protocol ne 'http') {
-                    $value =~ s,^git://gitorious\.org/qt-labs/,${url_base_for_protocol}qt/,;
-                }
-
-                # assume all other projects hosted under gitorious publicly.
                 $value =~ s,^git://gitorious\.org/,$url_base_for_protocol,;
         }
 
@@ -595,6 +584,38 @@ sub git_clone_one_submodule
     return;
 }
 
+sub ensure_link
+{
+    my ($self, $src, $tgt) = @_;
+    return if (!$self->{'force-hooks'} and -f $tgt);
+    unlink($tgt); # In case we have a dead symlink or pre-existing hook
+    print "Aliasing $src\n      as $tgt ...\n" if (!$self->{quiet});
+    return if eval { symlink($src, $tgt) };
+    # Windows doesn't do (proper) symlinks. As the post_commit script needs
+    # them to locate itself, we write a forwarding script instead.
+    open SCRIPT, ">".$tgt or die "Cannot create forwarding script $tgt: $!\n";
+    print SCRIPT "#!/bin/sh\nexec `dirname \$0`/$src \"\$\@\"\n";
+    close SCRIPT;
+}
+
+sub git_install_hooks
+{
+    my ($self) = @_;
+
+    return if (!-d 'qtrepotools/git-hooks');
+
+    chomp(my @modules = `git submodule foreach :`);
+    push @modules, "";
+    for my $module (@modules) {
+        $module =~ s,^Entering \'([^\']+)\'$,$1/,;
+        my $rel = $module;
+        $rel =~ s,[^/]+,..,g;
+        $rel .= "../../qtrepotools/git-hooks/";
+        $self->ensure_link($rel.'gerrit_commit_msg_hook', $module.'.git/hooks/commit-msg');
+        $self->ensure_link($rel.'git_post_commit_hook', $module.'.git/hooks/post-commit');
+    }
+}
+
 sub run
 {
     my ($self) = @_;
@@ -616,6 +637,8 @@ sub run
 
     $self->git_add_remotes('qt5');
 
+    $self->git_install_hooks;
+
     return;
 }
 

qt.pro

@@ -3,6 +3,7 @@ cache(, super)
 
 CONFIG += build_pass   # hack to disable the .qmake.super auto-add
 load(qt_build_config)
+CONFIG -= build_pass   # unhack, as it confuses Qt Creator
 
 TEMPLATE      = subdirs
 
@@ -53,34 +54,40 @@ defineTest(addModule) {
 # users responsibility to ensure that all needed dependencies exist, or
 # it may not build.
 
+ANDROID_EXTRAS =
+android: ANDROID_EXTRAS = qtandroidextras
+
 addModule(qtbase)
+addModule(qtandroidextras, qtbase)
+addModule(qtmacextras, qtbase)
 addModule(qtx11extras, qtbase)
-addModule(qlalr, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
-addModule(qtjsbackend, qtbase)
+addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
-addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns)
 addModule(qtquickcontrols, qtdeclarative)
 addModule(qtmultimedia, qtdeclarative)
+addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
 addModule(qtactiveqt, qtbase)
 addModule(qt3d, qtdeclarative)
 addModule(qtjsondb, qtdeclarative)
-addModule(qtsystems, qtbase, qtdeclarative qtjsondb)
+addModule(qtsystems, qtbase, qtdeclarative)
-addModule(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia)
+addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtsystems)
+addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative, qtjsondb)
-addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)
+addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro)
 addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
 addModule(qtwebkit-examples, qtwebkit qttools)
 addModule(qtimageformats, qtbase)
 addModule(qtgraphicaleffects, qtdeclarative)
-addModule(qtscript, qtbase)
+addModule(qtscript, qtbase, qttools)
-addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools)
+addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit)
 addModule(qtdocgallery, qtdeclarative, qtjsondb)
 !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
 addModule(qtserialport, qtbase)
+addModule(qtenginio, qtdeclarative)
+addModule(qtwebsockets, qtbase, qtdeclarative)
 addModule(qttranslations, qttools)
 addModule(qtdoc, qtdeclarative)
 addModule(qtqa, qtbase)