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

17 files changed, 11 insertions, 0 deletions

diff --git a/.gitmodules b/.gitmodules
index 55d8c315..9f3c65fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/init-repository b/init-repository
index 93465045..9eefd7e8 100755
--- a/init-repository
+++ b/init-repository
@@ -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
diff --git a/qt.pro b/qt.pro
index 12709517..6b1dfc64 100644
--- a/qt.pro
+++ b/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 \
diff --git a/qtactiveqt b/qtactiveqt
-Subproject 6729e60cfac84e8f6eb28cf473ce0c75f88d35c
+Subproject 70578095855138d8ba05bc187d6438a01138f90
diff --git a/qtbase b/qtbase
-Subproject 0add5fe930e275924813376bb06cbfc0f5f779d
+Subproject 240e35ddeb6a71c99bcef53eccee206b02d72d8
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 6c6cf86e7d65f8f5154d62ad0ed67d522126933
+Subproject 67eeff8459db037591b67e749da97b8fc0abc22
diff --git a/qtdoc b/qtdoc
-Subproject aa35a518920a46757caff8604a1bf0a7459d489
+Subproject 0734fe464dce885cc8a10250b9e3d2103bd37cd
diff --git a/qtlocation b/qtlocation
-Subproject 9b0d684b569e32dc9b8e13ebeeb3544d86871ff
+Subproject 822941f6c74753c69b189180af820e5b294434d
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 306424c55f9df61b686754591006b9e7e54a13d
+Subproject eb15d0e412fc1ddb3f99da4ff7d57902da3a5a6
diff --git a/qtphonon b/qtphonon
-Subproject 958a8233fdcb5a541692f8750d451bce54e2090
+Subproject 8b6f14dd619e4eb7ab041c9324a4ece43d5dd39
diff --git a/qtqa b/qtqa
-Subproject 4bdb72f4110e4c95c7ac73eaf0828727cd80cf7
+Subproject 75b5d2b5c5cb67a27bcfcb3d67dc8b91c0def6d
diff --git a/qtrepotools b/qtrepotools
-Subproject c297e2071c7e2d4ec4c1d2bec2f76a12f45c922
+Subproject 842aa1c00c1ae935193dbd4307ccdad5c46f36a
diff --git a/qtscript b/qtscript
-Subproject 0e575c1a309e8728313355e924de7c21ce3215e
+Subproject afafcbafd3a26ac66901ea5cfc760a99dc1c3b3
diff --git a/qtsensors b/qtsensors
new file mode 160000
+Subproject 19a84f7edab382ba55ae8bc8763dacc76ce8c39
diff --git a/qtsvg b/qtsvg
-Subproject 5e23c8dce60032ae7bb148320ed922bc146f960
+Subproject 0349979c987ee1c685e08f9179be37d45378c01
diff --git a/qttools b/qttools
-Subproject 363d254bd46c0c15a34c4ff533dad7f60642553
+Subproject a09b0fcc8e37c86d525fc234a2f8e218a2a674e
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 4af695e018452075dc3c8e07bbec8d52c6fae34
+Subproject 21f021f8a7b2f25a6d42a872d3511ced4ec53fe