summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Faure <faure+bluesystems@kde.org>2013-01-04 17:09:29 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-08 15:55:18 +0100
commitff63f0f3dc60c731ec77ed53678c00c06953b0ee (patch)
tree3d1680fcbff421f1871317d9751b8e9d59897684
parentcd769b2d31fb4f3703352b01316ba3c697a579cd (diff)
Add module qtx11extras to qt5.git
QX11Info was part of the Qt4 API, it should be part of the Qt5 API too. Change-Id: I08810ce25d0a91805a7fe4de5c8cb8f1b4ab3686 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository1
-rw-r--r--qt.pro5
m---------qtx11extras0
4 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 f6311290..b4cef4df 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/qtx11extras b/qtx11extras
new file mode 160000
+Subproject ad74017647aab6232abebed0e10aa731a9d536d