Updated submodules.

Change-Id: I7e2e8cad6636584f1d3fc9d213363e5fc6243ef2 Reviewed-by: Iikka Eklund <[email protected]>
Updated submodules.
2026-09-21 16:06:57 +08:00 · 2013-10-22 05:27:19 +02:00 · 2013-10-16 18:38:03 +02:00 · 2013-10-15 21:01:19 +02:00 · 2013-10-12 23:23:49 +02:00 · 2013-10-08 15:45:02 +02:00
45 changed files with 128 additions and 147 deletions
@@ -6,13 +6,27 @@

 # ==[ 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.
@@ -4,3 +4,4 @@
 .gitmodules             export-ignore
 .commit-template        export-ignore
 init-repository         export-ignore
+README.git              export-ignore
@@ -1,2 +1,3 @@
 Makefile
 .qmake.cache
+.qmake.super
@@ -73,9 +73,6 @@
 [submodule "qt3d"]
 	path = qt3d
 	url = ../qt3d.git
-[submodule "qtjsbackend"]
-	path = qtjsbackend
-	url = ../qtjsbackend.git
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
@@ -94,3 +91,12 @@
 [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
@@ -14,8 +14,8 @@ TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
 Agreement version 2.4

 This Technology Preview License Agreement ("Agreement")is a legal agreement
-between Digia USA, Inc. ("Digia"), with its registered office at 32 W.
-Loockerman Street, Suite 201, City of Dover, County of Kent, Delaware 19904,
+between Digia USA, Inc. ("Digia"), with its registered office at 2350
+Mission College Blvd., Suite 1020, Santa Clara, California 95054,
 U.S.A. and you (either an individual or a legal entity) ("Licensee") for the
 Licensed Software (as defined below).

@@ -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
-    make docs
+ After having built the documentation, you need to install it with the following
+ 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.
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#! /bin/sh
 #############################################################################
 ##
 ## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
@@ -40,61 +40,18 @@
 ##
 #############################################################################

-####################################################################################################
-#
-# Mother script for Qt Modularization
-#
-####################################################################################################
+srcpath=`dirname $0`
+srcpath=`(cd "$srcpath"; /bin/pwd)`
+configure=$srcpath/qtbase/configure
+if [ ! -e "$configure" ]; then
+    echo "$configure not found. Did you forget to run \"init-repository\"?" >&2
+    exit 1
+fi

-use strict;
-use warnings;
+mkdir -p qtbase || exit

-use File::Basename;
-use File::Path;
-use Cwd;
-use Cwd 'abs_path';
-use Config;
+echo "+ cd qtbase"
+cd qtbase || exit

-# Makes sure the arguments are directories, and creates them if not.
-# Will die if there is an error.
-sub ensureDir {
-    foreach (@_) {
-        if (-e $_) {
-            if (-d $_) {
-                next;
-            } else {
-                die ("$_ exists, but is not a directory");
-            }
-        }
-        File::Path::mkpath($_) or die("Could not create $_");
-    }
-}
-
-# `system', but also print the command
-sub system_v
-{
-    print "+ @_\n";
-    return system(@_);
-}
-
-my $relpath = dirname(abs_path($0));
-$relpath =~ s,\\,/,g;
-# the current directory is the "build tree" or "object tree"
-my $outpath = getcwd();
-
-if (! -e "$relpath/qtbase/configure") {
-    die("$relpath/qtbase/configure not found. Did you forget to run \"init-repository\"?");
-}
-
-ensureDir("$outpath/qtbase");
-chdir("$outpath/qtbase");
-my $ret = system_v("$relpath/qtbase/configure", @ARGV);
-if ($ret != 0) {
-    print "*** qtbase/configure exited with non-zero status.\n";
-    exit ($ret>>8) ;
-}
-
-chdir("$outpath");
-
-$ret = system_v("$outpath/qtbase/bin/qmake", "$relpath/qt.pro");
-exit ($ret>>8);
+echo "+ $configure -top-level $@"
+exec "$configure" -top-level "$@"
@@ -1,3 +1,4 @@
+@echo off
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
 :: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
@@ -38,5 +39,23 @@
 :: $QT_END_LICENSE$
 ::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-@rem ***** This assumes PERL is in the PATH *****
-@perl.exe %~dp0configure %*
+
+set "srcpath=%~dp0"
+set "configure=%srcpath%qtbase\configure.bat"
+if not exist "%configure%" (
+    echo %configure% not found. Did you forget to run "init-repository"? >&2
+    exit /b 1
+)
+
+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 %*
+set err=%errorlevel%
+
+cd ..
+
+exit /b %err%
@@ -104,8 +104,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 +114,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
-
-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.
+Switch to internal URLs and make use of the Oslo git mirrors.
+(Implies `--mirror').


 =item --http
@@ -205,8 +194,6 @@ use Pod::Usage   qw( pod2usage           );
 use Cwd          qw( getcwd              );

 my %PROTOCOLS = (
-    'internal'  => 'git://scm.dev.nokia.troll.no/' ,
-    'ssh'       => '[email protected]:'   ,
    'http'      => 'http://git.gitorious.org/'     ,
 );

@@ -215,6 +202,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
    qt5
    qlalr
    qtactiveqt
+    qtandroidextras
    qtbase
    qtconnectivity
    qtdeclarative
@@ -224,8 +212,8 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
    qtgraphicaleffects
    qtimageformats
    qtjsondb
-    qtjsbackend
    qtlocation
+    qtmacextras
    qtmultimedia
    qtpim
    qtqa
@@ -242,22 +230,26 @@ 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
-    qtjsbackend
+    qtmacextras
    qtmultimedia
    qtqa
    qtquick1
    qtquickcontrols
+    qtlocation
    qtrepotools
    qtscript
    qtsensors
@@ -267,6 +259,7 @@ my @DEFAULT_REPOS = qw(
    qttranslations
    qtwebkit
    qtwebkit-examples
+    qtwinextras
    qtx11extras
    qtxmlpatterns
 );
@@ -275,7 +268,10 @@ my $GERRIT_SSH_BASE
    = 'ssh://@[email protected]@PORT@/';

 my $BER_MIRROR_URL_BASE
-    = 'git://ber-git.europe.nokia.com/';
+    = 'git://hegel/';
+
+my $OSLO_MIRROR_URL_BASE
+    = 'git://qilin/';

 sub new
 {
@@ -315,7 +311,6 @@ sub parse_arguments
        'force'               => 0 ,
        'ignore-submodules'   => 0 ,
        'mirror-url'          => "",
-        'nokia-developer'     => 0 ,
        'protocol'            => "",
        'update'              => 1 ,
        'webkit'              => 1 ,
@@ -329,7 +324,6 @@ 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            }},
@@ -337,26 +331,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 {
-            $self->{'nokia-developer'}   = 1;
-            $self->{'protocol'}          = 'internal';
+        'berlin' => sub {
            $self->{'mirror-url'}        = $BER_MIRROR_URL_BASE;
        },
-
-        'nokia-developer' => sub {
-            $self->{'nokia-developer'}   = 1;
-            $self->{'protocol'}          = 'internal';
-            $self->{'ignore-submodules'} = 1;
+        'oslo' => sub {
+            $self->{'mirror-url'}        = $OSLO_MIRROR_URL_BASE;
        },
    ) || 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 +438,7 @@ sub git_set_submodule_config
        my $value = $2;

        if ($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.
+                # rewrite URL to chosen protocol
                $value =~ s,^git://gitorious\.org/,$url_base_for_protocol,;
        }

@@ -54,21 +54,23 @@ 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(qtjsbackend, qtbase)
-addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns)
+addModule(qtdeclarative, qtbase, 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(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia)
+addModule(qtsystems, qtbase, qtdeclarative)
+addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtsystems)
+addModule(qtconnectivity, qtbase, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative, qtjsondb)
 addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)