diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-10-28 16:22:01 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 14:38:44 +0100 |
| commit | d5d07c89f8e691e874549dd40d0263a3828240f3 (patch) | |
| tree | 5cafa3a22da3b709f6dcd57a2e843fec39bb91fa | |
| parent | c1849891276e2d50ce03ee12a715e2dc6ad6f375 (diff) | |
Added new module, qtjsondb.
Not yet enabled by default.
Change-Id: I07093f8770a7b2f05aa777cbf949a30478dacc67
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | init-repository | 1 | ||||
| -rw-r--r-- | qt.pro | 7 | ||||
| m--------- | qtjsondb | 0 |
4 files changed, 11 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 316745f9..94dbc621 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,3 +73,6 @@ [submodule "qtwayland"] path = qtwayland url = git://gitorious.org/qt/qtwayland.git +[submodule "qtjsondb"] + path = qtjsondb + url = git://gitorious.org/qt/qtjsondb.git diff --git a/init-repository b/init-repository index 9f402305..2561665b 100755 --- a/init-repository +++ b/init-repository @@ -228,6 +228,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtdoc qtdocgallery qtfeedback + qtjsondb qtlocation qtmultimedia qtphonon @@ -103,6 +103,12 @@ module_qtwayland.depends = module_qtbase # not yet enabled by default module_qtwayland.CONFIG = no_default_target no_default_install +module_qtjsondb.subdir = $$IN_PWD/qtjsondb +module_qtjsondb.target = module-qtjsondb +module_qtjsondb.depends = module_qtbase module_qtdeclarative module_qtsvg module_qtxmlpatterns +# not yet enabled by default +module_qtjsondb.CONFIG = no_default_target no_default_install + # only qtbase is required to exist. The others may not - but it is the # users responsibility to ensure that all needed dependencies exist, or # it may not build. @@ -130,6 +136,7 @@ exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland +exists(qtjsondb/qtjsondb.pro): SUBDIRS += module_qtjsondb exists(qtwebkit/Tools/Scripts/build-webkit) { SUBDIRS += module_qtwebkit \ diff --git a/qtjsondb b/qtjsondb new file mode 160000 +Subproject 54efae2d240b293b2d933bf6010af649d0328d3 |