Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Add new qtlocation module

.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

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

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 \