diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-08-24 16:05:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-24 09:50:58 +0200 |
| commit | 8c89a335b4be3745e486cc846e306c5df26c0e77 (patch) | |
| tree | d7df1b3bb8e9ea619af3db50714d3a38c8b949b7 | |
| parent | ae61bc2d1fc23bb474ceaacc6a8a6eba6ae93718 (diff) | |
Added new module, qtconnectivity.
Not yet enabled by default.
Change-Id: I89a8cb8cc6da9aeeba217e3ab3c10459082a21ed
Reviewed-on: http://codereview.qt.nokia.com/3447
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | init-repository | 1 | ||||
| -rw-r--r-- | qt.pro | 7 | ||||
| m--------- | qtconnectivity | 0 |
4 files changed, 11 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 7b380edd..6c0741c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -70,3 +70,6 @@ [submodule "qtpim"] path = qtpim url = git://gitorious.org/qt/qtpim.git +[submodule "qtconnectivity"] + path = qtconnectivity + url = git://gitorious.org/qt/qtconnectivity.git diff --git a/init-repository b/init-repository index a801bffa..e4555da3 100755 --- a/init-repository +++ b/init-repository @@ -223,6 +223,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qlalr qtactiveqt qtbase + qtconnectivity qtdeclarative qtdoc qtdocgallery @@ -101,6 +101,12 @@ module_qtpim.depends = module_qtdeclarative # not yet enabled by default module_qtpim.CONFIG = no_default_target no_default_install +module_qtconnectivity.subdir = $$IN_PWD/qtconnectivity +module_qtconnectivity.target = module-qtconnectivity +module_qtconnectivity.depends = module_qtsystems +# not yet enabled by default +module_qtconnectivity.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. @@ -127,6 +133,7 @@ exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback exists(qtquick3d/qtquick3d.pro): SUBDIRS += module_qtquick3d exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim +exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity exists(qtwebkit/Tools/Scripts/build-webkit) { SUBDIRS += module_qtwebkit \ diff --git a/qtconnectivity b/qtconnectivity new file mode 160000 +Subproject b02a597131ff2361f815d02e312b12b456ea375 |