Updated submodules.

Change-Id: I33606f80b5eef964e188220d8330c14369af93a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

.commit-template

@@ -6,27 +6,13 @@
 
 # ==[ Footers: Uncomment and edit where applicable ]===================|
 #
-# Change log entry (see below for instructions).
-#[ChangeLog][][]
-#
 # 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.
-# 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,3 +1,2 @@
 Makefile
 .qmake.cache
-.qmake.super

.gitmodules

@@ -73,6 +73,9 @@
 [submodule "qt3d"]
 	path = qt3d
 	url = ../qt3d.git
+[submodule "qtjsbackend"]
+	path = qtjsbackend
+	url = ../qtjsbackend.git
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
@@ -91,12 +94,3 @@
 [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

README

@@ -127,13 +127,12 @@ HOW TO BUILD QT5
  Documentation
  =============
 
- After configuring and compiling Qt, building the documentation is possible by running
+ After the configure step, building the documentation is possible by running
  "make docs".
+ Example:
 
- After having built the documentation, you need to install it with the following
- command:
-
-    make install_docs
+    ./configure -prefix $PWD/qtbase -opensource
+    make 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,5 +53,11 @@ mkdir -p qtbase || exit
 echo "+ cd qtbase"
 cd qtbase || exit
 
-echo "+ $configure -top-level $@"
-exec "$configure" -top-level "$@"
+echo "+ $configure $@"
+"$configure" "$@" || exit 1
+
+echo "+ cd .."
+cd ..
+
+echo "+ qtbase/bin/qmake $srcpath"
+exec qtbase/bin/qmake "$srcpath"

configure.bat

@@ -52,10 +52,17 @@ if not exist qtbase mkdir qtbase || exit /b 1
 echo + cd qtbase
 cd qtbase || exit /b 1
 
-echo + %configure% -top-level %*
-call %configure% -top-level %*
+echo + %configure% %*
+call %configure% %*
 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

@@ -104,6 +104,8 @@ 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.
 
@@ -114,15 +116,24 @@ B<Repository options:>
 
 =over
 
+=item --nokia-developer
+
+Switch to internal Nokia URLs.
+
+
 =item --berlin
 
-Switch to internal URLs and make use of the Berlin git mirrors.
+Switch to internal Nokia URLs and make use of the Berlin git mirrors.
 (Implies `--mirror').
 
-=item --oslo
 
-Switch to internal URLs and make use of the Oslo git mirrors.
-(Implies `--mirror').
+=item --ssh
+
+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
@@ -194,6 +205,8 @@ 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/'     ,
 );
 
@@ -202,7 +215,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qt5
     qlalr
     qtactiveqt
-    qtandroidextras
     qtbase
     qtconnectivity
     qtdeclarative
@@ -212,8 +224,8 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtgraphicaleffects
     qtimageformats
     qtjsondb
+    qtjsbackend
     qtlocation
-    qtmacextras
     qtmultimedia
     qtpim
     qtqa
@@ -230,26 +242,22 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtwayland
     qtwebkit
     qtwebkit-examples
-    qtwinextras
     qtx11extras
     qtxmlpatterns
 );
 
 my @DEFAULT_REPOS = qw(
     qtactiveqt
-    qtandroidextras
     qtbase
-    qtconnectivity
     qtdeclarative
     qtdoc
     qtgraphicaleffects
     qtimageformats
-    qtmacextras
+    qtjsbackend
     qtmultimedia
     qtqa
     qtquick1
     qtquickcontrols
-    qtlocation
     qtrepotools
     qtscript
     qtsensors
@@ -259,7 +267,6 @@ my @DEFAULT_REPOS = qw(
     qttranslations
     qtwebkit
     qtwebkit-examples
-    qtwinextras
     qtx11extras
     qtxmlpatterns
 );
@@ -268,10 +275,7 @@ my $GERRIT_SSH_BASE
     = 'ssh://@USER@codereview.qt-project.org@PORT@/';
 
 my $BER_MIRROR_URL_BASE
-    = 'git://hegel/';
-
-my $OSLO_MIRROR_URL_BASE
-    = 'git://qilin/';
+    = 'git://ber-git.europe.nokia.com/';
 
 sub new
 {
@@ -311,6 +315,7 @@ sub parse_arguments
         'force'               => 0 ,
         'ignore-submodules'   => 0 ,
         'mirror-url'          => "",
+        'nokia-developer'     => 0 ,
         'protocol'            => "",
         'update'              => 1 ,
         'webkit'              => 1 ,
@@ -324,6 +329,7 @@ sub parse_arguments
         'force'             =>  \$self->{qw{ force             }},
         '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            }},
@@ -331,15 +337,26 @@ sub parse_arguments
 
         'help|?'            =>  sub { pod2usage(1);               },
         'http'              =>  sub { $self->{protocol} = 'http'; },
+        'ssh|ssh-protocol'  =>  sub { $self->{protocol} = 'ssh';  },
 
-        'berlin' => sub {
+        'berlin|berlin-nokia-developer' => sub {
+            $self->{'nokia-developer'}   = 1;
+            $self->{'protocol'}          = 'internal';
             $self->{'mirror-url'}        = $BER_MIRROR_URL_BASE;
         },
-        'oslo' => sub {
-            $self->{'mirror-url'}        = $OSLO_MIRROR_URL_BASE;
+
+        'nokia-developer' => sub {
+            $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{//+$}{/};
 
@@ -438,7 +455,12 @@ sub git_set_submodule_config
         my $value = $2;
 
         if ($protocol) {
-                # rewrite URL to chosen protocol
+                # qt-labs projects are still hosted under qt internally.
+                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,;
         }
 

qt.pro

@@ -54,23 +54,21 @@ defineTest(addModule) {
 # it may not build.
 
 addModule(qtbase)
-addModule(qtandroidextras, qtbase)
-addModule(qtmacextras, qtbase)
 addModule(qtx11extras, qtbase)
 addModule(qlalr, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
-addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
+addModule(qtjsbackend, qtbase)
+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)
-addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
+addModule(qtsystems, qtbase, qtdeclarative qtjsondb)
+addModule(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtbase, qtdeclarative)
+addModule(qtconnectivity, qtsystems)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative, qtjsondb)
 addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)