diff options
| -rw-r--r-- | .commit-template | 16 | ||||
| -rw-r--r-- | README | 9 | ||||
| -rwxr-xr-x | init-repository | 50 | ||||
| -rw-r--r-- | qt.pro | 2 |
4 files changed, 32 insertions, 45 deletions
diff --git a/.commit-template b/.commit-template index f7933986..b7c00b82 100644 --- a/.commit-template +++ b/.commit-template @@ -11,8 +11,22 @@ # # Solicit reviewers. They still need to use the Gerrit frontend. #Reviewed-by: - +# +# Change log entry (see below for instructions). +#[ChangeLog][][] +# # ==[ 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. @@ -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. diff --git a/init-repository b/init-repository index d7632ea5..9a04dc3c 100755 --- a/init-repository +++ b/init-repository @@ -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' => 'git@scm.dev.nokia.troll.no:' , 'http' => 'http://git.gitorious.org/' , ); @@ -279,6 +266,9 @@ my $GERRIT_SSH_BASE my $BER_MIRROR_URL_BASE = 'git://hegel/'; +my $OSLO_MIRROR_URL_BASE + = 'git://qilin/'; + sub new { my ($class, @arguments) = @_; @@ -317,7 +307,6 @@ sub parse_arguments 'force' => 0 , 'ignore-submodules' => 0 , 'mirror-url' => "", - 'nokia-developer' => 0 , 'protocol' => "", 'update' => 1 , 'webkit' => 1 , @@ -331,7 +320,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 }}, @@ -339,26 +327,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{//+$}{/}; @@ -457,12 +434,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,; } @@ -55,12 +55,12 @@ defineTest(addModule) { addModule(qtbase) addModule(qtmacextras, qtbase) -addModule(qtwinextras, qtbase) addModule(qtx11extras, qtbase) addModule(qlalr, qtbase) addModule(qtsvg, qtbase) addModule(qtxmlpatterns, qtbase) addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns) +addModule(qtwinextras, qtbase, qtdeclarative) addModule(qtquickcontrols, qtdeclarative) addModule(qtmultimedia, qtdeclarative) addModule(qtactiveqt, qtbase) |