From 1117d4da2caf1989f63ca0a8073a799df80428bc Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 6 Aug 2012 10:21:23 +0200 Subject: [PATCH] Remove docgallery from qt5.git 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 Reviewed-by: Iikka Eklund Reviewed-by: Marius Storm-Olsen --- .gitmodules | 3 --- build.dependencies | 1 - init-repository | 1 - qt.pro | 6 ------ qtdocgallery | 1 - 5 files changed, 12 deletions(-) delete mode 160000 qtdocgallery diff --git a/.gitmodules b/.gitmodules index 5b0c29ca..cb992f7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/build.dependencies b/build.dependencies index d6448212..05b6f80f 100644 --- a/build.dependencies +++ b/build.dependencies @@ -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", diff --git a/init-repository b/init-repository index 0309c1a3..59f1dbd7 100755 --- a/init-repository +++ b/init-repository @@ -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 c9918ce3..c26cd760 100644 --- 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 index f3fa41d4..00000000 --- a/qtdocgallery +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f3fa41d4a98f49be8991f615d6d720779a2b5850