Added new module, qtpim.
authorRohan McGovern <rohan.mcgovern@nokia.com>
Wed, 24 Aug 2011 00:57:25 +0000 (10:57 +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: I7db1f9a782442876139306a25847e6f23194f672
Reviewed-on: http://codereview.qt.nokia.com/3427
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
.gitmodules
init-repository
qt.pro
qtpim [new submodule]

index 2c7daf9..7b380ed 100644 (file)
@@ -67,3 +67,6 @@
 [submodule "qtdocgallery"]
        path = qtdocgallery
        url = git://gitorious.org/qt/qtdocgallery.git
+[submodule "qtpim"]
+       path = qtpim
+       url = git://gitorious.org/qt/qtpim.git
index 1a3e332..a801bff 100755 (executable)
@@ -231,6 +231,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtmultimedia
     qtmultimediakit
     qtphonon
+    qtpim
     qtqa
     qtrepotools
     qtscript
diff --git a/qt.pro b/qt.pro
index 1f4ae49..11c077b 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -95,6 +95,12 @@ module_qtdocgallery.subdir = $$IN_PWD/qtdocgallery
 module_qtdocgallery.target = module-qtdocgallery
 module_qtdocgallery.depends = module_qtbase module_qtscript module_qtdeclarative
 
+module_qtpim.subdir = $$IN_PWD/qtpim
+module_qtpim.target = module-qtpim
+module_qtpim.depends = module_qtdeclarative
+# not yet enabled by default
+module_qtpim.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.
@@ -120,6 +126,7 @@ exists(qtmultimediakit/qtmultimediakit.pro): SUBDIRS += module_qtmultimediakit
 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(qtwebkit/Tools/Scripts/build-webkit) {
     SUBDIRS +=  module_qtwebkit \
diff --git a/qtpim b/qtpim
new file mode 160000 (submodule)
index 0000000..ff95b15
--- /dev/null
+++ b/qtpim
@@ -0,0 +1 @@
+Subproject commit ff95b1592bae300914e0e2a65d33b398f61391b1