summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-08-24 20:48:25 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-28 07:42:17 +0200
commit725a51b1d83626e16989804707356baa909c339f (patch)
tree091d1bc26966bd2abab804759003f63e598a1b56
parentf00429b71a3962efdad73c873c4882638a10df7c (diff)
Remove qtjsondb from qt5.git
The jsondb module has been ongoing research work. But it won't be done in time for Qt 5.0, and is currently also less relevant. It's also currently not being actively worked on. So let's remove it from the list of modules compiled with qt5.git and keep it as research. The module can still be compiled stand-alone on top of the Qt essentials. Change-Id: I6fd4524cae43b803a842788ff22a7525dc7bc0e6 Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
-rw-r--r--.gitmodules3
-rw-r--r--build.dependencies7
-rwxr-xr-xinit-repository1
-rw-r--r--qt.pro11
m---------qtjsondb0
5 files changed, 3 insertions, 19 deletions
diff --git a/.gitmodules b/.gitmodules
index cb992f7a..ba2aa2e0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,9 +64,6 @@
[submodule "qtwayland"]
path = qtwayland
url = git://gitorious.org/qt/qtwayland.git
-[submodule "qtjsondb"]
- path = qtjsondb
- url = git://gitorious.org/qt/qtjsondb.git
[submodule "qt3d"]
path = qt3d
url = git://gitorious.org/qt/qt3d.git
diff --git a/build.dependencies b/build.dependencies
index 05b6f80f..80c219b6 100644
--- a/build.dependencies
+++ b/build.dependencies
@@ -17,16 +17,15 @@ use Config;
"qtgraphicaleffects" => "qtbase,qtdeclarative,qtxmlpatterns",
"qtimageformats" => "qtbase",
"qtjsbackend" => "qtbase",
- "qtjsondb" => "qtbase,qtdeclarative,qtxmlpatterns",
- "qtlocation" => "qtbase,qtdeclarative,qt3d,qtjsondb:s",
+ "qtlocation" => "qtbase,qtdeclarative,qt3d",
"qtmultimedia" => "qtbase,qtdeclarative",
- "qtpim" => "qtdeclarative,qtjsondb:s",
+ "qtpim" => "qtdeclarative",
"qtqa" => "qtbase",
"qtquick1" => "qtbase,qtscript,qtxmlpatterns,qttools,qtsvg:s",
"qtscript" => "qtbase",
"qtsensors" => "qtbase,qtdeclarative",
"qtsvg" => "qtbase",
- "qtsystems" => "qtbase,qtdeclarative,qtjsondb:s",
+ "qtsystems" => "qtbase,qtdeclarative",
"qttools" => "qtbase,qtdeclarative,qtwebkit:s",
"qttranslations" => "qttools",
"qtwebkit" => "qtbase,qtscript,qtdeclarative,qtquick1,qtlocation",
diff --git a/init-repository b/init-repository
index 59f1dbd7..b63cf86b 100755
--- a/init-repository
+++ b/init-repository
@@ -229,7 +229,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtfeedback
qtgraphicaleffects
qtimageformats
- qtjsondb
qtjsbackend
qtlocation
qtmultimedia
diff --git a/qt.pro b/qt.pro
index c26cd760..730008ee 100644
--- a/qt.pro
+++ b/qt.pro
@@ -101,10 +101,6 @@ module_qtwayland.depends = module_qtbase module_qtdeclarative
# not yet enabled by default
module_qtwayland.CONFIG = no_default_target no_default_install
-module_qtjsondb.subdir = qtjsondb
-module_qtjsondb.target = module-qtjsondb
-module_qtjsondb.depends = module_qtbase module_qtdeclarative
-
module_qtimageformats.subdir = qtimageformats
module_qtimageformats.target = module-qtimageformats
module_qtimageformats.depends = module_qtbase
@@ -140,13 +136,6 @@ exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
exists(qtdeclarative/qtdeclarative.pro): SUBDIRS += module_qtdeclarative
exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d
exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript
-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_qtsystems.depends += module_qtjsondb
- module_qtlocation.depends += module_qtjsondb
-}
exists(qtlocation/qtlocation.pro) {
SUBDIRS += module_qtlocation
# These modules do not require qtlocation, but can use it if it is available
diff --git a/qtjsondb b/qtjsondb
deleted file mode 160000
-Subproject 3b693a54e53b6378af23a348ff74bb9d0728f96