diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-23 12:24:59 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-23 12:24:59 +0200 |
commit | 433e143b231a7cc7f1b37ce85d5ee6c3e06efab0 (patch) | |
tree | 6e89a975e9d569b69239059c7a0d0efe0fcb2687 | |
parent | e39f4e8b4be5da3d549c740ba396576bff7f952d (diff) | |
parent | acd97fec50d85bc9c82ea5ab49072acf992a0d0b (diff) |
Merge branch 'dev' into stable
Conflicts:
qtjsbackend
-rw-r--r-- | .gitmodules | 3 | ||||
-rwxr-xr-x | init-repository | 5 | ||||
m--------- | qlalr | 0 | ||||
-rw-r--r-- | qt.pro | 7 | ||||
m--------- | qt3d | 0 | ||||
m--------- | qtactiveqt | 0 | ||||
m--------- | qtconnectivity | 0 | ||||
m--------- | qtdocgallery | 0 | ||||
m--------- | qtfeedback | 0 | ||||
m--------- | qtgraphicaleffects | 0 | ||||
m--------- | qtimageformats | 0 | ||||
m--------- | qtjsbackend | 0 | ||||
m--------- | qtjsondb | 0 | ||||
m--------- | qtlocation | 0 | ||||
m--------- | qtmacextras | 0 | ||||
m--------- | qtpim | 0 | ||||
m--------- | qtsvg | 0 | ||||
m--------- | qtsystems | 0 | ||||
m--------- | qtwayland | 0 | ||||
m--------- | qtwebkit-examples | 0 | ||||
m--------- | qtwinextras | 0 | ||||
m--------- | qtx11extras | 0 | ||||
m--------- | qtxmlpatterns | 0 |
23 files changed, 6 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 8fbcde15..027a1274 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 diff --git a/init-repository b/init-repository index 9995d877..f662fb5c 100755 --- a/init-repository +++ b/init-repository @@ -211,7 +211,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtgraphicaleffects qtimageformats qtjsondb - qtjsbackend qtlocation qtmacextras qtmultimedia @@ -238,15 +237,16 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( my @DEFAULT_REPOS = qw( qtactiveqt qtbase + qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats - qtjsbackend qtmultimedia qtqa qtquick1 qtquickcontrols + qtlocation qtrepotools qtscript qtsensors @@ -256,6 +256,7 @@ my @DEFAULT_REPOS = qw( qttranslations qtwebkit qtwebkit-examples + qtwinextras qtx11extras qtxmlpatterns ); diff --git a/qlalr b/qlalr -Subproject d7064c2c7dfb36646811d2aefd097a8de941989 +Subproject a803a5c2142cd93a33ab5d3e549d794b1096bf0 @@ -59,16 +59,15 @@ 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(qtwinextras, qtbase, qtdeclarative) addModule(qtquickcontrols, qtdeclarative) addModule(qtmultimedia, qtdeclarative) 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(qtfeedback, qtdeclarative, qtmultimedia) diff --git a/qt3d b/qt3d -Subproject 6b8ee028ac0daae74f5521b9e5562f94b5e8e16 +Subproject 9a4f9f3eca02c8a6a76e5659920a984ff032d2d diff --git a/qtactiveqt b/qtactiveqt -Subproject 356b272b7afe4512becadf1bcefbcae9366fb00 +Subproject b29d07c554e5beed0e88b8d75fc42b40b77fee6 diff --git a/qtconnectivity b/qtconnectivity -Subproject fee6b50154d583422e6505a60a7d44d726785ab +Subproject ac2edceb02a61c1d670312385b1d70941796179 diff --git a/qtdocgallery b/qtdocgallery -Subproject f3fa41d4a98f49be8991f615d6d720779a2b585 +Subproject 870b170354688ae634f620c34ad3ad8aba347dd diff --git a/qtfeedback b/qtfeedback -Subproject 0d85e95a06ac6b5abbbf6715ae66c1e7109d639 +Subproject dea0da72655f1defccaea643dbe37373f669224 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 9e21979e13304b858301a62d227b7a801b94976 +Subproject 11c2286fcbcae87b24f9d069703d231d5bf997d diff --git a/qtimageformats b/qtimageformats -Subproject 9baeb56ceac51755e69589536a49c6f4cfefa4b +Subproject 82b7b9d3dc9e1eeff305a3e53e618d3413be123 diff --git a/qtjsbackend b/qtjsbackend deleted file mode 160000 -Subproject a48ae1d629f4c7939f3421db969f43db6bab8e1 diff --git a/qtjsondb b/qtjsondb -Subproject 3b693a54e53b6378af23a348ff74bb9d0728f96 +Subproject 4497f2a75480df320cd78680d26971bba42e742 diff --git a/qtlocation b/qtlocation -Subproject fd330db9e5631438f86e0fae52aea5454519d19 +Subproject e0256ec27512437421d8a63d9090e478b87af59 diff --git a/qtmacextras b/qtmacextras -Subproject e537fadafafb6e91be4597a779a77c8cce5b83b +Subproject 1ef71fcdb15ac0b93751142629b4a2d1ab1e73c diff --git a/qtpim b/qtpim -Subproject 099111a9fbaf31e954ca91a18d47272590f60ea +Subproject 902c55a228ea391d60b4493735741e29d01eed7 diff --git a/qtsvg b/qtsvg -Subproject cfd6618b3b9526bc82410411249692a32f29ee8 +Subproject bfda474003a1776359003661f141567cfa37d0d diff --git a/qtsystems b/qtsystems -Subproject 620592b4bc2fb4f92cfbd6f09eeafb31b30cb94 +Subproject 5084080c6235989f8165321e0cad8449f574d99 diff --git a/qtwayland b/qtwayland -Subproject 7334963a7911f5e8cfc18d6a21876bb9c16f1ab +Subproject af551d0e4f2c6708ff5aef6e758a39525877b1e diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject 5105e9dbc91e5e12ddfc26b53debbe3767e2187 +Subproject ca7d7a458b2dda46b69358255b1b2c0e587a729 diff --git a/qtwinextras b/qtwinextras -Subproject 447815121b25c2de61eba8446ad5db57ae739b5 +Subproject 0eade30f37980c38b14d5cfa475837d15b69a8c diff --git a/qtx11extras b/qtx11extras -Subproject f0a5def2727d30049cbc73425abe55acee3ffa8 +Subproject 8aaf6a3070b2ff1cab1fa79a79fb16e2768e1e5 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 409655f3451815930b70a71baa175ab9f34467e +Subproject e925560b37e148b468c2dcc5d6f163eb539df3e |