From ae61bc2d1fc23bb474ceaacc6a8a6eba6ae93718 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 24 Aug 2011 10:57:25 +1000 Subject: [PATCH] Added new module, qtpim. Not yet enabled by default. Change-Id: I7db1f9a782442876139306a25847e6f23194f672 Reviewed-on: http://codereview.qt.nokia.com/3427 Reviewed-by: Qt Sanity Bot Reviewed-by: Toby Tomkins --- .gitmodules | 3 +++ init-repository | 1 + qt.pro | 7 +++++++ qtpim | 1 + 4 files changed, 12 insertions(+) create mode 160000 qtpim diff --git a/.gitmodules b/.gitmodules index 2c7daf9..7b380ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/init-repository b/init-repository index 1a3e332..a801bff 100755 --- a/init-repository +++ b/init-repository @@ -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 --- 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 index 0000000..ff95b15 --- /dev/null +++ b/qtpim @@ -0,0 +1 @@ +Subproject commit ff95b1592bae300914e0e2a65d33b398f61391b1 -- 1.8.3.1