aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository1
-rw-r--r--qt.pro5
m---------qtactiveqt0
m---------qtbase0
m---------qtdeclarative0
m---------qtdoc0
m---------qtgraphicaleffects0
m---------qtimageformats0
m---------qtjsbackend0
m---------qtmultimedia0
m---------qtqa0
m---------qtquick10
m---------qtrepotools0
m---------qtscript0
m---------qtsvg0
m---------qttools0
m---------qttranslations0
m---------qtwebkit0
m---------qtwebkit-examples-and-demos0
m---------qtx11extras0
m---------qtxmlpatterns0
22 files changed, 9 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 4f09c921..9c31b262 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -52,3 +52,6 @@
[submodule "qtgraphicaleffects"]
path = qtgraphicaleffects
url = git://gitorious.org/qt/qtgraphicaleffects.git
+[submodule "qtx11extras"]
+ path = qtx11extras
+ url = git://gitorious.org/qt/qtx11extras.git
diff --git a/init-repository b/init-repository
index 8cbdc80e..34e18ac9 100755
--- a/init-repository
+++ b/init-repository
@@ -237,6 +237,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtwebkit
qtwebkit-examples-and-demos
qtxmlpatterns
+ qtx11extras
);
my $GERRIT_SSH_BASE
diff --git a/qt.pro b/qt.pro
index bcf2f6af..62468b27 100644
--- a/qt.pro
+++ b/qt.pro
@@ -61,6 +61,10 @@ module_qtmultimedia.subdir = qtmultimedia
module_qtmultimedia.target = module-qtmultimedia
module_qtmultimedia.depends = module_qtbase
+module_qtx11extras.subdir = qtx11extras
+module_qtx11extras.target = module-qtx11extras
+module_qtx11extras.depends = module_qtbase
+
module_qtimageformats.subdir = qtimageformats
module_qtimageformats.target = module-qtimageformats
module_qtimageformats.depends = module_qtbase
@@ -124,6 +128,7 @@ exists(qttools/qttools.pro) {
exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects
+exists(qtx11extras/qtx11extras.pro): SUBDIRS += module_qtx11extras
exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
diff --git a/qtactiveqt b/qtactiveqt
-Subproject b5366d0fa77bf219a26023a463c1b8045c7d306
+Subproject a5d94eb2207d5134343a05f830b6ff062553205
diff --git a/qtbase b/qtbase
-Subproject e17dddfd3bcc09a9ae919a1650107c8cd3a75d0
+Subproject 90361fd36c803c4c5c28d67f05ed66f619e0d39
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 7c5b2e93a0f61e2fbc3d554b97e23009e22b68b
+Subproject 08a83c42ad441044c669c909fecd80529d02df5
diff --git a/qtdoc b/qtdoc
-Subproject e7435af29366e979411130a1aa38179eda5269b
+Subproject 90ccab05608e43c0d5f09ef6e62237c53eca205
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 1444a08b7e16a09f056f3bed24cf843d29874cb
+Subproject 0bd009dfadb2e2187b29ebd27a6e6fdf8ff89c6
diff --git a/qtimageformats b/qtimageformats
-Subproject 9e7c3f09b1cf2e4645efd7aa25f69c299f88078
+Subproject 313d60c107d9659efd5e93ba5a036054f6b1ebb
diff --git a/qtjsbackend b/qtjsbackend
-Subproject ce0de1819ac3aad1d7da9e7bcfd99331fcc23dd
+Subproject 49fd16b31c8137ea50f06c0cf61f843f1d6f611
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 02fb5bea9bb0828a9f56989f6e48835eddd3310
+Subproject a0707d50cd792a6fd75b28fd0dd80b9801fc099
diff --git a/qtqa b/qtqa
-Subproject b2221faca328d173e4cb91b75a4cce90cb5568d
+Subproject 2fe57b53de3e8c8aa5f937bdc18549db9999efd
diff --git a/qtquick1 b/qtquick1
-Subproject 0cd72c52ca5e5b21adbd47d0f551535e727b80e
+Subproject ae764c678c78c1e3530a6d0dc2de2a17c5d4815
diff --git a/qtrepotools b/qtrepotools
-Subproject ef4f1434841acb955ecf586b168e83f70d4e9e1
+Subproject d8551dda06e4f3dbf3b7aab347a4b6449d5772f
diff --git a/qtscript b/qtscript
-Subproject aaddb67d074dcf1965e6c07a7232dd688deac41
+Subproject 7e1803d382fd199bae12c8e13cd710e51e633a0
diff --git a/qtsvg b/qtsvg
-Subproject 8ce0f65e1abf3b0b9a1684dac3a32cd0b03ffc3
+Subproject 5a5c91eade5f356209389f3d99cd36b7ac9ac68
diff --git a/qttools b/qttools
-Subproject 9b0b4e799aadde36521acff0dc3439b4eae5187
+Subproject 6afde37f3e3dfe707dcaf81994d34e94f74d953
diff --git a/qttranslations b/qttranslations
-Subproject ab38e82f91eba27f6343e86d9b4aca96f72322a
+Subproject 247ba8153251422622f89246a0af316dcde486f
diff --git a/qtwebkit b/qtwebkit
-Subproject 70c60ffc8530221d54e0b3f5d9b8687cd3eff87
+Subproject f28064fa297a1eb61d5311bbc1e8b8f3d66096b
diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos
-Subproject 1faaf0d1e580b158971fd21c9881676ae5e7ed1
+Subproject a34f4dcb275f383d073fea11457e5bf88c199de
diff --git a/qtx11extras b/qtx11extras
new file mode 160000
+Subproject ad74017647aab6232abebed0e10aa731a9d536d
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject c3c83eb164c3932a311ad47ef0e1991d0bdc6c0
+Subproject 37f34eb393d750c310e93e95b964a28a0118ad3