Added new module, qtconnectivity.
authorRohan McGovern <rohan.mcgovern@nokia.com>
Wed, 24 Aug 2011 06:05:34 +0000 (16:05 +1000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 24 Aug 2011 07:50:58 +0000 (09:50 +0200)
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>
.gitmodules
init-repository
qt.pro
qtconnectivity [new submodule]

index 7b380ed..6c0741c 100644 (file)
@@ -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
index a801bff..e4555da 100755 (executable)
@@ -223,6 +223,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qlalr
     qtactiveqt
     qtbase
+    qtconnectivity
     qtdeclarative
     qtdoc
     qtdocgallery
diff --git a/qt.pro b/qt.pro
index 11c077b..333d172 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -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 (submodule)
index 0000000..b02a597
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit b02a597131ff2361f815d02e312b12b456ea3752