aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository1
-rw-r--r--qt.pro7
m---------qtdocgallery0
4 files changed, 11 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index b594fad3..2c7daf9f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,3 +64,6 @@
[submodule "qtquick3d"]
path = qtquick3d
url = git://gitorious.org/qt-quick3d/qt-quick3d.git
+[submodule "qtdocgallery"]
+ path = qtdocgallery
+ url = git://gitorious.org/qt/qtdocgallery.git
diff --git a/init-repository b/init-repository
index 65275f9f..d01e314c 100755
--- a/init-repository
+++ b/init-repository
@@ -225,6 +225,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtbase
qtdeclarative
qtdoc
+ qtdocgallery
qtfeedback
qtlocation
qtmultimedia
diff --git a/qt.pro b/qt.pro
index 0d2a1a0e..5a5d36cf 100644
--- a/qt.pro
+++ b/qt.pro
@@ -95,6 +95,12 @@ module_qtquick3d.depends = module_qtbase module_qtdeclarative
# not yet enabled by default
module_qtquick3d.CONFIG = no_default_target no_default_install
+module_qtdocgallery.subdir = $$IN_PWD/qtdocgallery
+module_qtdocgallery.target = module-qtdocgallery
+module_qtdocgallery.depends = module_qtbase module_qtdeclarative
+# not yet enabled by default
+module_qtdocgallery.CONFIG = no_default_target no_default_install
+
# only qtbase is required to exist. The others may not - but it is the
# users responsibility to ensure that all needed dependencies exist, or
# it may not build.
@@ -119,6 +125,7 @@ exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
exists(qtmultimediakit/qtmultimediakit.pro): SUBDIRS += module_qtmultimediakit
exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
exists(qtquick3d/qtquick3d.pro): SUBDIRS += module_qtquick3d
+exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \
diff --git a/qtdocgallery b/qtdocgallery
new file mode 160000
+Subproject 1102fe901cfafda9df914a25a4a77c9c6049eb0