Remove qtjsondb from qt5.git master_201208281632
authorLars Knoll <lars.knoll@nokia.com>
Fri, 24 Aug 2012 18:48:25 +0000 (20:48 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 28 Aug 2012 05:42:17 +0000 (07:42 +0200)
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>
.gitmodules
build.dependencies
init-repository
qt.pro
qtjsondb [deleted submodule]

index cb992f7..ba2aa2e 100644 (file)
@@ -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
index 05b6f80..80c219b 100644 (file)
@@ -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",
index 59f1dbd..b63cf86 100755 (executable)
@@ -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 c26cd76..730008e 100644 (file)
--- 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 (submodule)
index 3b693a5..0000000
--- a/qtjsondb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3b693a54e53b6378af23a348ff74bb9d0728f96b