diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-05 12:46:24 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-10 06:34:16 +0100 |
| commit | 7e177c50ce41188533fbaa4c718f2a44db785738 (patch) | |
| tree | 1a945418208862d119bc34f1265725de86d8e4f9 | |
| parent | 522634777b5750b548411506d69c7a816bd51f4f (diff) | |
Added qtjsbackend module
Change-Id: I179a5714a12144e6815d931fef9fbfcedee6c93f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | init-repository | 3 | ||||
| -rw-r--r-- | qt.pro | 6 | ||||
| m--------- | qtjsbackend | 0 |
4 files changed, 10 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index f7ee3785..90cae42d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -79,3 +79,6 @@ [submodule "qt3d"] path = qt3d url = git://gitorious.org/qt/qt3d.git +[submodule "qtjsbackend"] + path = qtjsbackend + url = git://gitorious.org/qt/qtjsbackend.git diff --git a/init-repository b/init-repository index fffdccb9..c324eef6 100755 --- a/init-repository +++ b/init-repository @@ -231,6 +231,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtdocgallery qtfeedback qtjsondb + qtjsbackend qtlocation qtmultimedia qtphonon @@ -468,7 +469,7 @@ sub git_set_submodule_config if ($protocol) { # WebKit is special, and has only external link. - if ($key ne 'qtwebkit' and $key ne 'qt3d') { + if ($key ne 'qtwebkit' and $key ne 'qt3d' and $key ne 'qtjsbackend') { # qt-labs projects are still hosted under qt internally. if ($protocol ne 'http') { $value =~ s,^git://gitorious\.org/qt-labs/,${url_base_for_protocol}qt/,; @@ -19,9 +19,13 @@ module_qtscript.subdir = $$IN_PWD/qtscript module_qtscript.target = module-qtscript module_qtscript.depends = module_qtbase +module_qtjsbackend.subdir = $$IN_PWD/qtjsbackend +module_qtjsbackend.target = module-qtjsbackend +module_qtjsbackend.depends = module_qtbase + module_qtdeclarative.subdir = $$IN_PWD/qtdeclarative module_qtdeclarative.target = module-qtdeclarative -module_qtdeclarative.depends = module_qtbase module_qtxmlpatterns +module_qtdeclarative.depends = module_qtbase module_qtxmlpatterns module_qtjsbackend module_qtwebkit.file = qtwebkit.pri module_qtwebkit.makefile = Makefile.qtwebkit diff --git a/qtjsbackend b/qtjsbackend new file mode 160000 +Subproject e399c4a15d59fba66838fa1a17e306ab14470fc |