aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex <qt-info@nokia.com>2011-05-20 16:16:33 +1000
committerAlex <qt-info@nokia.com>2011-05-20 16:16:33 +1000
commitdd45bb27355aff642ba1402512860f136c5cd5b6 (patch)
tree7310228d80c562109bf42c89dec88ad925060e4a
parent25d7376943f792878307af0a560a5e7fe3b7a8e6 (diff)
Add new QtSensors module
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository1
-rw-r--r--qt.pro7
m---------qtsensors0
4 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/qtsensors b/qtsensors
new file mode 160000
+Subproject 19a84f7edab382ba55ae8bc8763dacc76ce8c39