lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-09 20:47:49 +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:
  Add the QtSystems module.
This commit is contained in:
Qt Continuous Integration System
2011-06-23 17:59:27 +10:00
parent f899887738 f7225b87a9
commit 2ac5c82153
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

@@ -52,3 +52,6 @@
[submodule "qtsensors"] [submodule "qtsensors"]
path = qtsensors path = qtsensors
url = git://gitorious.org/qt/qtsensors.git url = git://gitorious.org/qt/qtsensors.git
[submodule "qtsystems"]
path = qtsystems
url = git://gitorious.org/qt/qtsystems.git

1
init-repository
View File

@@ -224,6 +224,7 @@ my %STAGING_REPOS = map { $_ => "git://gitorious.org/qt/$_-staging.git" } qw(
qtxmlpatterns qtxmlpatterns
qtlocation qtlocation
qtsensors qtsensors
qtsystems
); );
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

@@ -73,6 +73,12 @@ module_qtsensors.subdir = $$IN_PWD/qtsensors
module_qtsensors.target = module-qtsensors module_qtsensors.target = module-qtsensors
module_qtsensors.depends = module_qtbase module_qtdeclarative module_qtsensors.depends = module_qtbase module_qtdeclarative
module_qtsystems.subdir = $$IN_PWD/qtsystems
module_qtsystems.target = module-qtsystems
module_qtsystems.depends = module_qtbase module_qtdeclarative
# not yet enabled by default
module_qtsystems.CONFIG = no_default_target no_default_install
SUBDIRS = \ SUBDIRS = \
module_qtbase \ module_qtbase \
module_qtsvg \ module_qtsvg \
@@ -89,6 +95,7 @@ SUBDIRS = \
module_qtlocation \ module_qtlocation \
module_qtactiveqt \ module_qtactiveqt \
module_qtsensors \ module_qtsensors \
module_qtsystems \
exists(qtwebkit/Tools/Scripts/build-webkit) { exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \ SUBDIRS += module_qtwebkit \

1
qtsystems Submodule

Submodule qtsystems added at c0b5b3b6bb