aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository1
-rw-r--r--qt.pro7
m---------qtfeedback0
4 files changed, 11 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 5e21a131..b171ac1f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,3 +58,6 @@
[submodule "qtmultimediakit"]
path = qtmultimediakit
url = git://gitorious.org/qt/qtmultimediakit.git
+[submodule "qtfeedback"]
+ path = qtfeedback
+ url = git://gitorious.org/qt/qtfeedback.git
diff --git a/init-repository b/init-repository
index 26f92a98..0bffe33b 100755
--- a/init-repository
+++ b/init-repository
@@ -225,6 +225,7 @@ my %STAGING_REPOS = map { $_ => "git://gitorious.org/qt/$_-staging.git" } qw(
qtlocation
qtsensors
qtsystems
+ qtfeedback
);
my %GERRIT_REPOS = map { $_ => "codereview.qt.nokia.com:qt/$_.git" } qw(
diff --git a/qt.pro b/qt.pro
index e569beb4..132907c3 100644
--- a/qt.pro
+++ b/qt.pro
@@ -83,6 +83,12 @@ module_qtmultimediakit.depends = module_qtbase module_qtdeclarative
# not yet enabled by default
module_qtmultimediakit.CONFIG = no_default_target no_default_install
+module_qtfeedback.subdir = $$IN_PWD/qtfeedback
+module_qtfeedback.target = module-qtfeedback
+module_qtfeedback.depends = module_qtbase module_qtdeclarative
+# not yet enabled by default
+module_qtfeedback.CONFIG = no_default_target no_default_install
+
SUBDIRS = \
module_qtbase \
module_qtsvg \
@@ -101,6 +107,7 @@ SUBDIRS = \
module_qtsensors \
module_qtsystems \
module_qtmultimediakit \
+ module_qtfeedback \
exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \
diff --git a/qtfeedback b/qtfeedback
new file mode 160000
+Subproject d8fb85f96701da66d5acc1ce02d1dac269ca5e4