summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex <qt-info@nokia.com>2011-05-10 15:26:44 +1000
committerAlex <qt-info@nokia.com>2011-05-10 15:26:44 +1000
commit0044c57a81cbe2ea5779272ad72d6371dc0442e1 (patch)
treeb1d86f71cf7d00aa33ba6e79f1a4c8321329e301
parentcaba93a9a672e575e8621d0b4a8b5800769794e9 (diff)
Add new qtlocation module
The module is not yet enabled as various other repos need to be in place first.
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository1
-rw-r--r--qt.pro5
m---------qtlocation0
4 files changed, 9 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index a1ad14f2..55d8c315 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,3 +46,6 @@
[submodule "qtwebkit"]
path = qtwebkit
url = git://gitorious.org/webkit/qtwebkit.git
+[submodule "qtlocation"]
+ path = qtlocation
+ url = git://gitorious.org/qt/qtlocation.git
diff --git a/init-repository b/init-repository
index 423fc856..b7a0fe45 100755
--- a/init-repository
+++ b/init-repository
@@ -204,6 +204,7 @@ my %STAGING_REPOS = map { $_ => "git://gitorious.org/qt/$_.git" } qw(
qttranslations-staging
qtwebkit-examples-and-demos-staging
qtxmlpatterns-staging
+ qtlocation-staging
);
my $BNE_MIRROR_URL_BASE
diff --git a/qt.pro b/qt.pro
index fc5f424d..d2fb223d 100644
--- a/qt.pro
+++ b/qt.pro
@@ -65,6 +65,11 @@ module_qtqa.subdir = $$IN_PWD/qtqa
module_qtqa.target = module-qtqa
module_qtqa.depends = module-qtbase
+# not yet enabled via SUBDIRS
+module_qtlocation.subdir = $$IN_PWD/qtlocation
+module_qtlocation.target = module-qtlocation
+module_qtlocation.depends = module-qtbase
+
SUBDIRS = \
module_qtbase \
module_qtsvg \
diff --git a/qtlocation b/qtlocation
new file mode 160000
+Subproject 5cd7fecf53ee6f4381417db3dd199fd3355685d