diff options
| -rw-r--r-- | .gitmodules | 27 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rwxr-xr-x | init-repository | 21 | ||||
| m--------- | qlalr | 0 | ||||
| -rw-r--r-- | qt.pro | 74 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtfeedback | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtjsbackend | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtpim | 0 | ||||
| m--------- | qtqa | 0 | ||||
| m--------- | qtquick1 | 0 | ||||
| m--------- | qtrepotools | 0 | ||||
| m--------- | qtscript | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtsvg | 0 | ||||
| m--------- | qtsystems | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qttranslations | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebkit | 0 | ||||
| m--------- | qtwebkit-examples-and-demos | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
31 files changed, 6 insertions, 124 deletions
diff --git a/.gitmodules b/.gitmodules index ba2aa2e0..13ae4fe2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,9 +28,6 @@ [submodule "qtdoc"] path = qtdoc url = git://gitorious.org/qt/qtdoc.git -[submodule "qlalr"] - path = qlalr - url = git://gitorious.org/qt/qlalr.git [submodule "qtrepotools"] path = qtrepotools url = git://gitorious.org/qt/qtrepotools.git @@ -43,30 +40,6 @@ [submodule "qtwebkit"] path = qtwebkit url = git://gitorious.org/qtwebkit/qt5-module.git -[submodule "qtlocation"] - path = qtlocation - url = git://gitorious.org/qt/qtlocation.git -[submodule "qtsensors"] - path = qtsensors - url = git://gitorious.org/qt/qtsensors.git -[submodule "qtsystems"] - path = qtsystems - url = git://gitorious.org/qt/qtsystems.git -[submodule "qtfeedback"] - path = qtfeedback - url = git://gitorious.org/qt/qtfeedback.git -[submodule "qtpim"] - path = qtpim - url = git://gitorious.org/qt/qtpim.git -[submodule "qtconnectivity"] - path = qtconnectivity - url = git://gitorious.org/qt/qtconnectivity.git -[submodule "qtwayland"] - path = qtwayland - url = git://gitorious.org/qt/qtwayland.git -[submodule "qt3d"] - path = qt3d - url = git://gitorious.org/qt/qt3d.git [submodule "qtjsbackend"] path = qtjsbackend url = git://gitorious.org/qt/qtjsbackend.git @@ -73,9 +73,7 @@ sub ensureDir { # `system', but also print the command sub system_v { - print "+ "; - print @_; - print "\n"; + print "+ @_\n"; return system(@_); } @@ -90,7 +88,7 @@ if (! -e "$relpath/qtbase/configure") { ensureDir("$outpath/qtbase"); chdir("$outpath/qtbase"); -my $ret = system_v("$relpath/qtbase/configure @ARGV"); +my $ret = system_v("$relpath/qtbase/configure", @ARGV); if ($ret != 0) { print "*** qtbase/configure exited with non-zero status.\n"; exit ($ret>>8) ; @@ -98,5 +96,5 @@ if ($ret != 0) { chdir("$outpath"); -$ret = system_v("$outpath/qtbase/bin/qmake $relpath/qt.pro"); +$ret = system_v("$outpath/qtbase/bin/qmake", "$relpath/qt.pro"); exit ($ret>>8); diff --git a/init-repository b/init-repository index 2e9cd92a..eaae77da 100755 --- a/init-repository +++ b/init-repository @@ -102,7 +102,7 @@ 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/--brisbane. +This option is default for --nokia-developer. After using this option, pass `--ignore-submodules=none' to git to override it as needed. @@ -119,11 +119,6 @@ B<Repository options:> Switch to internal Nokia URLs. -=item --brisbane - -Switch to internal Nokia URLs and make use of the Brisbane git mirrors. -(Implies `--mirror' and `--mirror-webkit'). - =item --berlin Switch to internal Nokia URLs and make use of the Berlin git mirrors. @@ -250,12 +245,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( my $GERRIT_SSH_BASE = 'ssh://@USER@codereview.qt-project.org@PORT@/'; -my $BNE_MIRROR_URL_BASE - = 'git://bq-git.apac.nokia.com/qtsoftware/'; - -my $BNE_MIRROR_WEBKIT_URL - = 'git://bq-git.apac.nokia.com/gitorious/qtwebkit/qt5-module.git'; - my $BER_MIRROR_URL_BASE = 'git://ber-git.europe.nokia.com/'; @@ -327,14 +316,6 @@ sub parse_arguments 'http' => sub { $self->{protocol} = 'http'; }, 'ssh|ssh-protocol' => sub { $self->{protocol} = 'ssh'; }, - 'brisbane|brisbane-nokia-developer' => sub { - $self->{'nokia-developer'} = 1; - $self->{'protocol'} = 'internal'; - $self->{'mirror-url'} = $BNE_MIRROR_URL_BASE; - $self->{'mirror-webkit-url'} = $BNE_MIRROR_WEBKIT_URL; - $self->{'ignore-submodules'} = 1; - }, - 'berlin|berlin-nokia-developer' => sub { $self->{'nokia-developer'} = 1; $self->{'protocol'} = 'internal'; diff --git a/qlalr b/qlalr deleted file mode 160000 -Subproject 842fbd8d0c7b0199d36669af22fc3031f4e9c0c @@ -29,6 +29,7 @@ module_qtdeclarative.target = module-qtdeclarative module_qtdeclarative.depends = module_qtbase module_qtjsbackend module_qtwebkit.file = qtwebkit/WebKit.pro +module_qtwebkit.makefile = Makefile module_qtwebkit.depends = module_qtbase module_qtdeclarative module_qtwebkit.target = module-qtwebkit @@ -52,52 +53,14 @@ module_qtactiveqt.subdir = qtactiveqt module_qtactiveqt.target = module-qtactiveqt module_qtactiveqt.depends = module_qtbase -module_qlalr.subdir = qlalr -module_qlalr.target = module-qlalr -module_qlalr.depends = module_qtbase - module_qtqa.subdir = qtqa module_qtqa.target = module-qtqa module_qtqa.depends = module_qtbase -module_qtlocation.subdir = qtlocation -module_qtlocation.target = module-qtlocation -module_qtlocation.depends = module_qtbase - -module_qtsensors.subdir = qtsensors -module_qtsensors.target = module-qtsensors -module_qtsensors.depends = module_qtbase - -module_qtsystems.subdir = qtsystems -module_qtsystems.target = module-qtsystems -module_qtsystems.depends = module_qtbase - module_qtmultimedia.subdir = qtmultimedia module_qtmultimedia.target = module-qtmultimedia module_qtmultimedia.depends = module_qtbase -module_qtfeedback.subdir = qtfeedback -module_qtfeedback.target = module-qtfeedback -module_qtfeedback.depends = module_qtbase module_qtdeclarative - -module_qt3d.subdir = qt3d -module_qt3d.target = module-qt3d -module_qt3d.depends = module_qtbase module_qtdeclarative - -module_qtpim.subdir = qtpim -module_qtpim.target = module-qtpim -module_qtpim.depends = module_qtdeclarative - -module_qtconnectivity.subdir = qtconnectivity -module_qtconnectivity.target = module-qtconnectivity -module_qtconnectivity.depends = module_qtsystems - -module_qtwayland.subdir = qtwayland -module_qtwayland.target = module-qtwayland -module_qtwayland.depends = module_qtbase -# not yet enabled by default -module_qtwayland.CONFIG = no_default_target no_default_install - module_qtimageformats.subdir = qtimageformats module_qtimageformats.target = module-qtimageformats module_qtimageformats.depends = module_qtbase @@ -134,41 +97,10 @@ exists(qtdeclarative/qtdeclarative.pro) { SUBDIRS += module_qtdeclarative # These modules do not require qtdeclarative, but can use it if it is available module_qttools.depends += module_qtdeclarative - module_qtsensors.depends += module_qtdeclarative - module_qtsystems.depends += module_qtdeclarative module_qtmultimedia.depends += module_qtdeclarative - module_qtwayland.depends += module_qtdeclarative -} -exists(qt3d/qt3d.pro) { - SUBDIRS += module_qt3d - # These modules do not require qt3d, but can use it if it is available - module_qtlocation.depends += module_qtdeclarative module_qt3d } exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript -exists(qtlocation/qtlocation.pro) { - SUBDIRS += module_qtlocation - # These modules do not require qtlocation, but can use it if it is available - module_qtwebkit.depends += module_qtlocation -} -exists(qtsensors/qtsensors.pro) { - SUBDIRS += module_qtsensors - # These modules do not require qtsensors, but can use it if it is available - module_qtwebkit.depends += module_qtsensors -} -exists(qtsystems/qtsystems.pro) { - SUBDIRS += module_qtsystems - # These modules do not require qtsystems, but can use it if it is available - module_qtlocation.depends += module_qtsystems -} -exists(qtmultimedia/qtmultimedia.pro) { - SUBDIRS += module_qtmultimedia - # These modules do not require qtmultimedia, but can use it if it is available - module_qtfeedback.depends += module_qtmultimedia - module_qtlocation.depends += module_qtmultimedia -} -exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback -exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim -exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity +exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia exists(qtactiveqt/qtactiveqt.pro) { SUBDIRS += module_qtactiveqt module_qttools.depends += module_qtactiveqt @@ -190,10 +122,8 @@ exists(qttools/qttools.pro) { module_qtquick1.depends += module_qttools } exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1 -!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa -exists(qlalr/qlalr.pro): SUBDIRS += module_qlalr diff --git a/qt3d b/qt3d deleted file mode 160000 -Subproject 264ca5ea8415da704864f94dba201a514e58e7a diff --git a/qtactiveqt b/qtactiveqt -Subproject 9bd8fe40ad65c95829155995bb68c1f1ee453d4 +Subproject 2fe214ca90cfda68126bf6e83e876a3a0063552 diff --git a/qtbase b/qtbase -Subproject 7c382d81d9fb622f9e9c813c3a7e44ded11e60e +Subproject b98b11fa036ea301d1483df6f533ec55be727d9 diff --git a/qtconnectivity b/qtconnectivity deleted file mode 160000 -Subproject f3d8f66116af4319650d8f3e7ca069275fdfa78 diff --git a/qtdeclarative b/qtdeclarative -Subproject 50399e39a398cfd4bf0cdb6b514ad89c42fc0a2 +Subproject 48b2d386399341307027efb151f59873c537240 diff --git a/qtdoc b/qtdoc -Subproject 93878790dce8ab150268c10afe3742864220f64 +Subproject 3734eeb4d384c2020d160ae128f5e29642acfb8 diff --git a/qtfeedback b/qtfeedback deleted file mode 160000 -Subproject 7deab3943d7a42b6722c404542afaaffafda5a0 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 03143da00f27512376c75d346bfe2965cd73f13 +Subproject fcbc6043f102dce56f0c457748f489e7e2bd0c0 diff --git a/qtimageformats b/qtimageformats -Subproject 67d8c677126282b02d99dd3ad23a72770797fce +Subproject a0ec617b21d9ce0c562e8e7c0dc59bc4d08c509 diff --git a/qtjsbackend b/qtjsbackend -Subproject f5db1b5f6a04d5f08671ae4cee2eea8283a578a +Subproject 4cbcad7fbb5606e6f183062b5f15be08b9568ec diff --git a/qtlocation b/qtlocation deleted file mode 160000 -Subproject 09ec9ab3e8bae7f8ad36697f4a66bf8d6fba936 diff --git a/qtmultimedia b/qtmultimedia -Subproject b616dd5165a2f1e554eda1f85acf6c6000ba24b +Subproject db8f5da7af46b00e8819f0525fc71c480f4f585 diff --git a/qtpim b/qtpim deleted file mode 160000 -Subproject e7772415d658770632a3bd4b85d6b200ba3af79 diff --git a/qtqa b/qtqa -Subproject 46912385ce0fd8b5debdf100f4ad86a37cc3b2e +Subproject 98e8f3b99b9a40c21feb50868da1b93295ed5c3 diff --git a/qtquick1 b/qtquick1 -Subproject 9b345360dc1c008150efe57fbd28d6a194132de +Subproject be3a2bf91bfa83b14787a32ec5ebdd273afb01d diff --git a/qtrepotools b/qtrepotools -Subproject ed500477ba5a4c50ad39bea708a35a3f11456a2 +Subproject 4cfe9583da2a1e615555b60507e138a044f43bb diff --git a/qtscript b/qtscript -Subproject 375a6e8204aab89873185e023b414a0669c93cb +Subproject d142740257fde3c9a1e17fd352bf0d5100b547f diff --git a/qtsensors b/qtsensors deleted file mode 160000 -Subproject fb68fb8c052ae08fabed8f49256e79b0d0915fb diff --git a/qtsvg b/qtsvg -Subproject 0da0b741861f6f5ecc13bde683c950814ded3ed +Subproject 45483bfae4f59ab92be22007cf49d9d7eee8a16 diff --git a/qtsystems b/qtsystems deleted file mode 160000 -Subproject 229812fdc2d59ce836f10512db0af554940bcb4 diff --git a/qttools b/qttools -Subproject 6abd1967feb38585d3a4c17d944d50d1d22b028 +Subproject 83f67b09c1b2b994d1252c4494d51072d2c5143 diff --git a/qttranslations b/qttranslations -Subproject 4b3460dd2f83c4b233265725eef4f6a310b1d4e +Subproject ad9181a543adb463badda61c10ab75574d28548 diff --git a/qtwayland b/qtwayland deleted file mode 160000 -Subproject c0d42b05b450aa255a6b2c88fb61b70848f924e diff --git a/qtwebkit b/qtwebkit -Subproject 33b26980cb24288b5a9f2590ccf32a949281bb7 +Subproject 23037105e948c2065da5a937d3a2396b0ff45c1 diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos -Subproject e4d8ed24528a7350ccc4f285eec31690bdccb41 +Subproject 57629dcb40a465899585a69b737edf6d60332aa diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 641eb19618986b2857fd2282833d0c11df4e2a1 +Subproject 69b7a0bb97d773d1699ce94e15fc4c86f0b10dc |