diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | build.dependencies | 7 | ||||
| -rwxr-xr-x | init-repository | 1 | ||||
| -rw-r--r-- | qt.pro | 11 | ||||
| m--------- | qtjsondb | 0 |
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 @@ -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 |