summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules33
-rwxr-xr-xbuild9
m---------qlalr0
-rw-r--r--qt.pro49
m---------qt3d0
m---------qtactiveqt0
m---------qtbase0
m---------qtconnectivity0
m---------qtdeclarative0
m---------qtdoc0
m---------qtdocgallery0
m---------qtfeedback0
m---------qtgraphicaleffects0
m---------qtimageformats0
m---------qtjsbackend0
m---------qtjsondb0
m---------qtlocation0
m---------qtmultimedia0
m---------qtphonon0
m---------qtpim0
m---------qtqa0
m---------qtquick10
m---------qtrepotools0
m---------qtsensors0
m---------qtsystems0
m---------qttools0
m---------qttranslations0
m---------qtwayland0
m---------qtwebkit0
m---------qtxmlpatterns0
30 files changed, 64 insertions, 27 deletions
diff --git a/.gitmodules b/.gitmodules
index e83ecc26..e7d5d1eb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,15 @@
[submodule "qtdeclarative"]
path = qtdeclarative
url = git://gitorious.org/qt/qtdeclarative.git
+[submodule "qtactiveqt"]
+ path = qtactiveqt
+ url = git://gitorious.org/qt/qtactiveqt.git
[submodule "qtscript"]
path = qtscript
url = git://gitorious.org/qt/qtscript.git
+[submodule "qtphonon"]
+ path = qtphonon
+ url = git://gitorious.org/qt/qtphonon.git
[submodule "qtmultimedia"]
path = qtmultimedia
url = git://gitorious.org/qt/qtmultimedia.git
@@ -19,12 +25,24 @@
[submodule "qtxmlpatterns"]
path = qtxmlpatterns
url = git://gitorious.org/qt/qtxmlpatterns.git
+[submodule "qttranslations"]
+ path = qttranslations
+ url = git://gitorious.org/qt/qttranslations.git
[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
[submodule "qtwebkit-examples-and-demos"]
path = qtwebkit-examples-and-demos
url = git://gitorious.org/qt/qtwebkit-examples-and-demos.git
+[submodule "qtqa"]
+ path = qtqa
+ url = git://gitorious.org/qt/qtqa.git
[submodule "qtwebkit"]
path = qtwebkit
url = git://gitorious.org/qtwebkit/qt5-module.git
@@ -37,9 +55,24 @@
[submodule "qtsystems"]
path = qtsystems
url = git://gitorious.org/qt/qtsystems.git
+[submodule "qtfeedback"]
+ path = qtfeedback
+ url = git://gitorious.org/qt/qtfeedback.git
+[submodule "qtdocgallery"]
+ path = qtdocgallery
+ url = git://gitorious.org/qt/qtdocgallery.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 "qtjsondb"]
+ path = qtjsondb
+ url = git://gitorious.org/qt/qtjsondb.git
[submodule "qt3d"]
path = qt3d
url = git://gitorious.org/qt/qt3d.git
diff --git a/build b/build
index ded93996..61c333c7 100755
--- a/build
+++ b/build
@@ -212,8 +212,13 @@ sub detect_configuration
# Use the /MP compiler option, if using nmake, to use all CPU threads when compiling
if ($exe =~ 'nmake') {
- use Env qw(@CL);
- unshift @CL, '/MP';
+ my $cl = $ENV{'CL'};
+ if (defined $cl) {
+ $cl .= ' /MP';
+ } else {
+ $cl = '/MP';
+ }
+ $ENV{'CL'} = $cl;
}
$self->{'MAKE'} = "\"$exe\"" if (defined $exe);
diff --git a/qlalr b/qlalr
new file mode 160000
+Subproject c786df115d7d0ab9968dbd6facced669cca2bf2
diff --git a/qt.pro b/qt.pro
index 1517358f..0d00a951 100644
--- a/qt.pro
+++ b/qt.pro
@@ -136,29 +136,12 @@ exists(qtsvg/qtsvg.pro) {
module_qtdeclarative.depends += module_qtsvg
module_qtquick1.depends += module_qtsvg
}
-exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon
exists(qtxmlpatterns/qtxmlpatterns.pro): SUBDIRS += module_qtxmlpatterns
-exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript
+exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
exists(qtdeclarative/qtdeclarative.pro): SUBDIRS += module_qtdeclarative
-exists(qttools/qttools.pro): SUBDIRS += module_qttools
-exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
-exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
-exists(qlalr/qlalr.pro): SUBDIRS += module_qlalr
-exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
-exists(qtlocation/qtlocation.pro): SUBDIRS += module_qtlocation
-exists(qtactiveqt/qtactiveqt.pro) {
- SUBDIRS += module_qtactiveqt
- module_qttools.depends += module_qtactiveqt
-}
-exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
-exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
-exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
-exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d
-exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
-exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
-exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity
-!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
+exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript
+exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
exists(qtjsondb/qtjsondb.pro) {
SUBDIRS += module_qtjsondb
# These modules do not require qtjsondb, but can use it if it is available
@@ -166,13 +149,29 @@ exists(qtjsondb/qtjsondb.pro) {
module_qtdocgallery.depends += module_qtjsondb
module_qtsystems.depends += module_qtjsondb
}
-exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
-exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
-exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
-exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects
-
+exists(qtlocation/qtlocation.pro): SUBDIRS += module_qtlocation
+exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
+exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
+exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon
+exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
+exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
+exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
+exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
+exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity
exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \
module_qtwebkit_examples_and_demos
module_qttools.depends += module_qtwebkit
}
+exists(qtactiveqt/qtactiveqt.pro) {
+ SUBDIRS += module_qtactiveqt
+ module_qttools.depends += module_qtactiveqt
+}
+exists(qttools/qttools.pro): SUBDIRS += module_qttools
+!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
-Subproject 4b2cffa47a66add6e10f4408bb8a9cea33f781e
+Subproject 33749ac2435893239079eeb011e24ff69edc620
diff --git a/qtactiveqt b/qtactiveqt
new file mode 160000
+Subproject fea1dd6238a4c5f7f49e0c2719df906eb2f30e6
diff --git a/qtbase b/qtbase
-Subproject ca572c0b806388cbc58dcba4ab6d7cc25d89366
+Subproject c75ef6e2231163493b0d8878670ec7cada29100
diff --git a/qtconnectivity b/qtconnectivity
new file mode 160000
+Subproject e9fe7e968f1318484c237a2709b71deddeb4a68
diff --git a/qtdeclarative b/qtdeclarative
-Subproject ec7deb3d123bb44b5d57590615a60ed48b1d286
+Subproject df2adc4a45a94c332104ef4114a8d25da21f8c9
diff --git a/qtdoc b/qtdoc
-Subproject 09bb2d974a937ead7450a65e1b5b3f0e58cd18a
+Subproject 6ad37f6be42b44422db5ca7ce897d9ea4c3f04e
diff --git a/qtdocgallery b/qtdocgallery
new file mode 160000
+Subproject 448f3da422a855cd190753dbf67ae4ecb05728f
diff --git a/qtfeedback b/qtfeedback
new file mode 160000
+Subproject bb8bb715ba6dd817fc1bf644712f70b6179860a
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 00b397a785b18201372ff7260493ef35959face
+Subproject 6c901d493c88654ecc649cdc6d65d9e250a5536
diff --git a/qtimageformats b/qtimageformats
-Subproject f1cd7f80eb5892665afe15f472c5342171f6830
+Subproject f0db5ceeab8048aca6f7cf56cb2e6f098882fda
diff --git a/qtjsbackend b/qtjsbackend
-Subproject afefa8cbe7bf468921a8316fc749fcbc42f0e1b
+Subproject 2c1bc67598c55314c226c27530398a9a7ddbf1b
diff --git a/qtjsondb b/qtjsondb
new file mode 160000
+Subproject 4a34bb1465ca2e1d3f8a588e3a5c51eeecbdc08
diff --git a/qtlocation b/qtlocation
-Subproject 32712d70bbab3b703f614ca5b77e5d3b0cf3f74
+Subproject 3d60b7f959df4c107703e31d45c707e36a97194
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 13025c05c7471127873a3dc9928579387d1361c
+Subproject 28ed595a303b05d4d2a006023d619d1a23238b1
diff --git a/qtphonon b/qtphonon
new file mode 160000
+Subproject b362e749bf7d87539ec5c8025b7af9394f1c3cd
diff --git a/qtpim b/qtpim
new file mode 160000
+Subproject efdf03881daa815ab1e6f1a690065fb900b3812
diff --git a/qtqa b/qtqa
new file mode 160000
+Subproject 346d42b3fe8677078216131df2b195738861761
diff --git a/qtquick1 b/qtquick1
-Subproject bc60289c41ca5a069e7a0845f2ff1b3ab107d54
+Subproject 2b0b7d459a7fa336ce526b1a6c793cf57d82a4c
diff --git a/qtrepotools b/qtrepotools
new file mode 160000
+Subproject ee9f1ad27a1f6cf0e43fb6d8c7df2ef53517389
diff --git a/qtsensors b/qtsensors
-Subproject d5fbd8c4a7e9aa19d5b71c02208c242754b84bd
+Subproject 74a2c5d2414be2f69df5e11761e889dce888744
diff --git a/qtsystems b/qtsystems
-Subproject 4151cd3912d236c6d289308b4bd5f579e183a61
+Subproject 1a5919661f094f0c64645c2ccfc28638e12d748
diff --git a/qttools b/qttools
-Subproject ef2557d7df7d8134344db5473042c5805fb3731
+Subproject ed8fe268ed50a98f2479911ed7f8803b12f846d
diff --git a/qttranslations b/qttranslations
new file mode 160000
+Subproject d23250c442368365f3d8c906bb837664197936f
diff --git a/qtwayland b/qtwayland
-Subproject 72db1a20a522d1ecdffbacd704de0d76fbd4faf
+Subproject 585a1080cc755c0c7820a06ecfd059f75af60bf
diff --git a/qtwebkit b/qtwebkit
-Subproject 32f186b0a5b8f5d13d83d2f7d52dce031928904
+Subproject e1380c825d6d08d8762ccd09b4749b33aa51cc5
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject ccfe9a0190fd9cac0cf7d1af0b0bdc45380210d
+Subproject 0d6c28c5eb7046bbc011b060fdcab1f622ed9f9