aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-09-17 10:39:06 +0200
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-09-23 20:29:32 +0200
commit597bb62d2b44e4fa276db252555479e041d3835c (patch)
tree465db624981f794797e0dfe4452569b8e990494a
parent0af9ceef917859cf0de83891b707a4ce967e7fbf (diff)
remove qtjsondb
It's dead, Jim. Change-Id: Id8e1ddb266018bfd582af27bb7eb860287e4567c Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--.gitmodules3
-rw-r--r--qt.pro3
m---------qtjsondb0
3 files changed, 1 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index 81d528c0..403872d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -81,9 +81,6 @@
[submodule "qtwayland"]
path = qtwayland
url = ../qtwayland.git
-[submodule "qtjsondb"]
- path = qtjsondb
- url = ../qtjsondb.git
[submodule "qt3d"]
path = qt3d
url = ../qt3d.git
diff --git a/qt.pro b/qt.pro
index b7a73797..15fd48ec 100644
--- a/qt.pro
+++ b/qt.pro
@@ -69,7 +69,6 @@ addModule(qtmultimedia, qtbase, qtdeclarative)
addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
addModule(qtactiveqt, qtbase)
addModule(qt3d, qtdeclarative)
-addModule(qtjsondb, qtdeclarative)
addModule(qtsystems, qtbase, qtdeclarative)
addModule(qtlocation, qtbase, qtsystems qtmultimedia)
addModule(qtsensors, qtbase, qtdeclarative)
@@ -85,7 +84,7 @@ addModule(qtimageformats, qtbase)
addModule(qtgraphicaleffects, qtdeclarative)
addModule(qtscript, qtbase, qttools)
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit)
-addModule(qtdocgallery, qtdeclarative, qtjsondb)
+addModule(qtdocgallery, qtdeclarative)
linux:!android: addModule(qtwayland, qtbase, qtdeclarative)
addModule(qtserialport, qtbase)
addModule(qtenginio, qtdeclarative)
diff --git a/qtjsondb b/qtjsondb
deleted file mode 160000
-Subproject 58223ab8aaafe3d313863a9b757e9c9bd624376