diff options
| -rw-r--r-- | .commit-template | 16 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitmodules | 15 | ||||
| -rw-r--r-- | README | 9 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.bat | 11 | ||||
| -rwxr-xr-x | init-repository | 63 | ||||
| m--------- | qlalr | 0 | ||||
| -rw-r--r-- | qt.pro | 19 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtandroidextras | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtdocgallery | 0 | ||||
| m--------- | qtenginio | 0 | ||||
| m--------- | qtfeedback | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtjsbackend | 0 | ||||
| m--------- | qtjsondb | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtpim | 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--------- | qtsystems | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qttranslations | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebkit | 0 | ||||
| m--------- | qtwebkit-examples | 0 | ||||
| m--------- | qtwinextras | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
44 files changed, 69 insertions, 75 deletions
diff --git a/.commit-template b/.commit-template index f7933986..0aef528f 100644 --- a/.commit-template +++ b/.commit-template @@ -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. @@ -1,2 +1,3 @@ Makefile .qmake.cache +.qmake.super diff --git a/.gitmodules b/.gitmodules index d8c8bd28..4a1c3d05 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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,15 @@ [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 @@ -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. @@ -53,11 +53,5 @@ mkdir -p qtbase || exit echo "+ cd qtbase" cd qtbase || exit -echo "+ $configure $@" -"$configure" "$@" || exit 1 - -echo "+ cd .." -cd .. - -echo "+ qtbase/bin/qmake $srcpath" -exec qtbase/bin/qmake "$srcpath" +echo "+ $configure -top-level $@" +exec "$configure" -top-level "$@" diff --git a/configure.bat b/configure.bat index 73395684..d3bb977f 100644 --- a/configure.bat +++ b/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% %* -call %configure% %* +echo + %configure% -top-level %* +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% diff --git a/init-repository b/init-repository index 3bd600ff..272193d8 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/' , ); @@ -215,17 +202,19 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qt5 qlalr qtactiveqt + qtandroidextras qtbase qtconnectivity qtdeclarative qtdoc qtdocgallery + qtenginio qtfeedback qtgraphicaleffects qtimageformats qtjsondb - qtjsbackend qtlocation + qtmacextras qtmultimedia qtpim qtqa @@ -242,22 +231,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 +260,7 @@ my @DEFAULT_REPOS = qw( qttranslations qtwebkit qtwebkit-examples + qtwinextras qtx11extras qtxmlpatterns ); @@ -275,7 +269,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 { @@ -315,7 +312,6 @@ sub parse_arguments 'force' => 0 , 'ignore-submodules' => 0 , 'mirror-url' => "", - 'nokia-developer' => 0 , 'protocol' => "", 'update' => 1 , 'webkit' => 1 , @@ -329,7 +325,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 +332,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 +439,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,; } diff --git a/qlalr b/qlalr -Subproject d7064c2c7dfb36646811d2aefd097a8de941989 +Subproject a803a5c2142cd93a33ab5d3e549d794b1096bf0 @@ -54,33 +54,36 @@ 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) +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(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools) +addModule(qtscript, qtbase, qttools) +addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit) addModule(qtdocgallery, qtdeclarative, qtjsondb) !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialport, qtbase) +addModule(qtenginio, qtdeclarative) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) diff --git a/qt3d b/qt3d -Subproject 6b8ee028ac0daae74f5521b9e5562f94b5e8e16 +Subproject 9a4f9f3eca02c8a6a76e5659920a984ff032d2d diff --git a/qtactiveqt b/qtactiveqt -Subproject 8c71c115808cf08a135ab4a8186c3a215477559 +Subproject cd3e1f5dd257fbe1d1b86d4f72eea01293d3104 diff --git a/qtandroidextras b/qtandroidextras new file mode 160000 +Subproject abdb38773693745f5d2f8319b470bfbe0373cc1 diff --git a/qtbase b/qtbase -Subproject c15a8cc283d5d7b26677b9c71cabb1f5f47494f +Subproject c819a8926959ecadfe2e588e28918ed6fb90ce5 diff --git a/qtconnectivity b/qtconnectivity -Subproject fee6b50154d583422e6505a60a7d44d726785ab +Subproject 0910eb9a769fbcf437dd86db2385496b498e752 diff --git a/qtdeclarative b/qtdeclarative -Subproject 7ec1d9797b1a9c058945fad20a6c8d3171f8955 +Subproject 1738e4ee119bbcd20d33353e7018f04d9276663 diff --git a/qtdoc b/qtdoc -Subproject ce5168f69cde3abd2644c54ea7e162f6fb0bb2d +Subproject b430aa843350fe5cad777055708af403d3d1dd7 diff --git a/qtdocgallery b/qtdocgallery -Subproject f3fa41d4a98f49be8991f615d6d720779a2b585 +Subproject 870b170354688ae634f620c34ad3ad8aba347dd diff --git a/qtenginio b/qtenginio new file mode 160000 +Subproject 136ee0aa5dc2276699018bc743e758ea9ffda12 diff --git a/qtfeedback b/qtfeedback -Subproject 0d85e95a06ac6b5abbbf6715ae66c1e7109d639 +Subproject dea0da72655f1defccaea643dbe37373f669224 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 520dcd65b5dce886c5f458deb60dde157c5dd88 +Subproject c640a496d63036ead177dd006ef56b9b12d962b diff --git a/qtimageformats b/qtimageformats -Subproject dd53060d7628d34d16d99ba7cca5d864cb5dec5 +Subproject d507c358b803cd40ec13ed19e00eced80b73257 diff --git a/qtjsbackend b/qtjsbackend deleted file mode 160000 -Subproject 904d8b8825aa82dbc6b888968f983ba6aa33983 diff --git a/qtjsondb b/qtjsondb -Subproject 3b693a54e53b6378af23a348ff74bb9d0728f96 +Subproject 4497f2a75480df320cd78680d26971bba42e742 diff --git a/qtlocation b/qtlocation -Subproject fd330db9e5631438f86e0fae52aea5454519d19 +Subproject e3db0e405d771e11fa6b4f98d39e90b32db9d61 diff --git a/qtmacextras b/qtmacextras new file mode 160000 +Subproject 1906da15d32340571a04d3d7e2e190bfee26f21 diff --git a/qtmultimedia b/qtmultimedia -Subproject df4336a84426c84e692df86172cc0bf38126183 +Subproject 99667804e1c64cace1246d4ce342a218fc1fb1b diff --git a/qtpim b/qtpim -Subproject 099111a9fbaf31e954ca91a18d47272590f60ea +Subproject 902c55a228ea391d60b4493735741e29d01eed7 diff --git a/qtqa b/qtqa -Subproject f573d62c576cd3efd3332411d3c695bf00e707c +Subproject 50d9961bc34bcf6a95e14db7d8e1f2fa7709822 diff --git a/qtquick1 b/qtquick1 -Subproject d714c0576cc9fa30537c390003203d79c8ab46d +Subproject 960afee2cf5041d873f596e91eeafb42d3144e9 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject e79cf774cecdde218795f5061bb3aaae4bc2123 +Subproject 8c2e3601d70b3bc7f004e15797c9fca61332ea5 diff --git a/qtrepotools b/qtrepotools -Subproject a5273ab7d83aed8f8b74d8347631ec9888badef +Subproject f4a8911813ab5649ee26d6502587cbf279f32a1 diff --git a/qtscript b/qtscript -Subproject d3514897db0902f58fa589f5a1c12745ab26709 +Subproject 78985c5c2c4ec8c7d06bf0c59c5534f968d62f0 diff --git a/qtsensors b/qtsensors -Subproject 1484cb76315984d4833b510bf9b4e65af4ca696 +Subproject e3af89e2630bba68d3f10a33bccdd19bbc46664 diff --git a/qtserialport b/qtserialport -Subproject 84df6ec29db5981d30d1149a8b4a091ecc7c5dc +Subproject 9128eddd57cfa95da490e08c49a7fdcdd77b9ff diff --git a/qtsvg b/qtsvg -Subproject 963048b982d823e44e785b765b70249720acd25 +Subproject b719b93770393bbf20251e1dffc70498061e612 diff --git a/qtsystems b/qtsystems -Subproject 620592b4bc2fb4f92cfbd6f09eeafb31b30cb94 +Subproject 5084080c6235989f8165321e0cad8449f574d99 diff --git a/qttools b/qttools -Subproject e0de3b7205efb3d99d38f19d1ee3e7e49ae5045 +Subproject f0610b8b0811d459bb1a9d6c309c013c7e543f8 diff --git a/qttranslations b/qttranslations -Subproject 94ff4dbe6f56360aec737532ec17ab0fdfb7be2 +Subproject 88e03d26ffa2f2ba0bab3e2e76cc8dc573801b4 diff --git a/qtwayland b/qtwayland -Subproject 7334963a7911f5e8cfc18d6a21876bb9c16f1ab +Subproject af551d0e4f2c6708ff5aef6e758a39525877b1e diff --git a/qtwebkit b/qtwebkit -Subproject 4b88baaa5179c9fb699b0f699cdd1c4860333a2 +Subproject 8c7a7606acbb2083c8077cce57054f43744cb1c diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject 3e4d8aa8f0dd63ba67b3c484bcd070dba8c87e1 +Subproject 89a3330783ba1b16fca2a27a99e090a458fbd0a diff --git a/qtwinextras b/qtwinextras new file mode 160000 +Subproject 7317f4440a9af01feac7758afff8f98e9150dd6 diff --git a/qtx11extras b/qtx11extras -Subproject c3db2845abbcca29ac12ca42f0e29487e5b482f +Subproject 120c2267e1960c03a22531c2d5bfe1d87d401ad diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 3f3a2bbf41c68b5ab6596f785ca949f143126bc +Subproject 97f266a006d82cc8554915cba6bf767b93d71a0 |