lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-18 11:06:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Added qtfeedback module.
This commit is contained in:
Qt Continuous Integration System
2011-07-04 10:57:41 +10:00
parent 2e0f534cc4 1225ee9c51
commit 3e42e0076e
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -58,3 +58,6 @@
[submodule "qtmultimediakit"] [submodule "qtmultimediakit"]
path = qtmultimediakit path = qtmultimediakit
url = git://gitorious.org/qt/qtmultimediakit.git url = git://gitorious.org/qt/qtmultimediakit.git
[submodule "qtfeedback"]
path = qtfeedback
url = git://gitorious.org/qt/qtfeedback.git

1
init-repository
View File

@@ -225,6 +225,7 @@ my %STAGING_REPOS = map { $_ => "git://gitorious.org/qt/$_-staging.git" } qw(
qtlocation qtlocation
qtsensors qtsensors
qtsystems qtsystems
qtfeedback
); );
my %GERRIT_REPOS = map { $_ => "codereview.qt.nokia.com:qt/$_.git" } qw( my %GERRIT_REPOS = map { $_ => "codereview.qt.nokia.com:qt/$_.git" } qw(

7
qt.pro
View File

@@ -83,6 +83,12 @@ module_qtmultimediakit.depends = module_qtbase module_qtdeclarative
# not yet enabled by default # not yet enabled by default
module_qtmultimediakit.CONFIG = no_default_target no_default_install 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 = \ SUBDIRS = \
module_qtbase \ module_qtbase \
module_qtsvg \ module_qtsvg \
@@ -101,6 +107,7 @@ SUBDIRS = \
module_qtsensors \ module_qtsensors \
module_qtsystems \ module_qtsystems \
module_qtmultimediakit \ module_qtmultimediakit \
module_qtfeedback \
exists(qtwebkit/Tools/Scripts/build-webkit) { exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \ SUBDIRS += module_qtwebkit \

1
qtfeedback Submodule

Submodule qtfeedback added at d8fb85f967