mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-01 03:07:13 +08:00
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: Updated submodule references to latest modules' content Add new QtSensors module
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -49,3 +49,6 @@
|
||||
[submodule "qtlocation"]
|
||||
path = qtlocation
|
||||
url = git://gitorious.org/qt/qtlocation.git
|
||||
[submodule "qtsensors"]
|
||||
path = qtsensors
|
||||
url = git://gitorious.org/qt/qtsensors.git
|
||||
|
||||
@@ -209,6 +209,7 @@ my %STAGING_REPOS = map { $_ => "git://gitorious.org/qt/$_.git" } qw(
|
||||
qtwebkit-examples-and-demos-staging
|
||||
qtxmlpatterns-staging
|
||||
qtlocation-staging
|
||||
qtsensors-staging
|
||||
);
|
||||
|
||||
my $BNE_MIRROR_URL_BASE
|
||||
|
||||
7
qt.pro
7
qt.pro
@@ -71,6 +71,12 @@ module_qtlocation.depends = module_qtbase module_qtdeclarative
|
||||
# not yet enabled by default
|
||||
module_qtlocation.CONFIG = no_default_target no_default_install
|
||||
|
||||
module_qtsensors.subdir = $$IN_PWD/qtsensors
|
||||
module_qtsensors.target = module-qtsensors
|
||||
module_qtsensors.depends = module_qtbase module_qtdeclarative
|
||||
# not yet enabled by default
|
||||
module_qtsensors.CONFIG = no_default_target no_default_install
|
||||
|
||||
SUBDIRS = \
|
||||
module_qtbase \
|
||||
module_qtsvg \
|
||||
@@ -86,6 +92,7 @@ SUBDIRS = \
|
||||
module_qtqa \
|
||||
module_qtlocation \
|
||||
module_qtactiveqt \
|
||||
module_qtsensors \
|
||||
|
||||
exists(qtwebkit/Tools/Scripts/build-webkit) {
|
||||
SUBDIRS += module_qtwebkit \
|
||||
|
||||
Submodule qtactiveqt updated: 6729e60cfa...7057809585
2
qtbase
2
qtbase
Submodule qtbase updated: 0add5fe930...240e35ddeb
Submodule qtdeclarative updated: 6c6cf86e7d...67eeff8459
2
qtdoc
2
qtdoc
Submodule qtdoc updated: aa35a51892...0734fe464d
Submodule qtlocation updated: 9b0d684b56...822941f6c7
Submodule qtmultimedia updated: 306424c55f...eb15d0e412
2
qtphonon
2
qtphonon
Submodule qtphonon updated: 958a8233fd...8b6f14dd61
2
qtqa
2
qtqa
Submodule qtqa updated: 4bdb72f411...75b5d2b5c5
Submodule qtrepotools updated: c297e2071c...842aa1c00c
2
qtscript
2
qtscript
Submodule qtscript updated: 0e575c1a30...afafcbafd3
1
qtsensors
Submodule
1
qtsensors
Submodule
Submodule qtsensors added at 19a84f7eda
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 5e23c8dce6...0349979c98
2
qttools
2
qttools
Submodule qttools updated: 363d254bd4...a09b0fcc8e
Submodule qtxmlpatterns updated: 4af695e018...21f021f8a7
Reference in New Issue
Block a user