Remove docgallery from qt5.git master_201208062150
authorLars Knoll <lars.knoll@nokia.com>
Mon, 6 Aug 2012 08:21:23 +0000 (10:21 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 6 Aug 2012 11:45:32 +0000 (13:45 +0200)
The document gallery has been pretty much unmaintained for a year
now and the only backends we have are for tracker (ie. the N9),
the deprecated jsondb client API and the simulator. it doesn't
work anywhere else currently.

Change-Id: I5c12e23be7ed8862e891e996fbd6191e79f4fdef
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
.gitmodules
build.dependencies
init-repository
qt.pro
qtdocgallery [deleted submodule]

index 5b0c29c..cb992f7 100644 (file)
@@ -55,9 +55,6 @@
 [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
index d644821..05b6f80 100644 (file)
@@ -13,7 +13,6 @@ use Config;
     "qtconnectivity" => "qtsystems",
     "qtdeclarative" => "qtbase,qtxmlpatterns,qtjsbackend",
     "qtdoc" => "qtbase,qtdeclarative",
-    "qtdocgallery" => "qtbase,qtdeclarative,qtjsondb:s",
     "qtfeedback" => "qtbase,qtmultimedia,qtdeclarative",
     "qtgraphicaleffects" => "qtbase,qtdeclarative,qtxmlpatterns",
     "qtimageformats" => "qtbase",
index 0309c1a..59f1dbd 100755 (executable)
@@ -226,7 +226,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtconnectivity
     qtdeclarative
     qtdoc
-    qtdocgallery
     qtfeedback
     qtgraphicaleffects
     qtimageformats
diff --git a/qt.pro b/qt.pro
index c9918ce..c26cd76 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -87,10 +87,6 @@ module_qt3d.subdir = qt3d
 module_qt3d.target = module-qt3d
 module_qt3d.depends = module_qtbase module_qtdeclarative
 
-module_qtdocgallery.subdir = qtdocgallery
-module_qtdocgallery.target = module-qtdocgallery
-module_qtdocgallery.depends = module_qtbase module_qtdeclarative
-
 module_qtpim.subdir = qtpim
 module_qtpim.target = module-qtpim
 module_qtpim.depends = module_qtdeclarative
@@ -148,7 +144,6 @@ exists(qtjsondb/qtjsondb.pro) {
     SUBDIRS += module_qtjsondb
     # These modules do not require qtjsondb, but can use it if it is available
     module_qtpim.depends += module_qtjsondb
-    module_qtdocgallery.depends += module_qtjsondb
     module_qtsystems.depends += module_qtjsondb
     module_qtlocation.depends += module_qtjsondb
 }
@@ -174,7 +169,6 @@ exists(qtmultimedia/qtmultimedia.pro) {
     module_qtlocation.depends += 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(qtactiveqt/qtactiveqt.pro) {
diff --git a/qtdocgallery b/qtdocgallery
deleted file mode 160000 (submodule)
index f3fa41d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f3fa41d4a98f49be8991f615d6d720779a2b5850