summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-09-23 12:51:56 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-09-27 12:53:47 +0200
commit0d22f2d30d56cfdee7e3310ce1940c35b484e2a5 (patch)
tree1c062e9c78aca89e7734bc3b265ef55f0fa4de9e
parentf3636c9757a216a357a7da20031c96f3aec15b8e (diff)
Add new qtandroidextras repositoryv5.2.0-alpha1
Also adding it as part of the default modules. Change-Id: I899ba6eec9ba6ab7103ecc6dba5245da16e01a32 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository2
-rw-r--r--qt.pro1
m---------qtandroidextras0
4 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 027a1274..e8c071b9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -97,3 +97,6 @@
[submodule "qtwinextras"]
path = qtwinextras
url = ../qtwinextras.git
+[submodule "qtandroidextras"]
+ path = qtandroidextras
+ url = ../qtandroidextras.git
diff --git a/init-repository b/init-repository
index 8cb38238..819e98f1 100755
--- a/init-repository
+++ b/init-repository
@@ -202,6 +202,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qt5
qlalr
qtactiveqt
+ qtandroidextras
qtbase
qtconnectivity
qtdeclarative
@@ -236,6 +237,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
my @DEFAULT_REPOS = qw(
qtactiveqt
+ qtandroidextras
qtbase
qtconnectivity
qtdeclarative
diff --git a/qt.pro b/qt.pro
index 724967dd..5b80d163 100644
--- a/qt.pro
+++ b/qt.pro
@@ -54,6 +54,7 @@ defineTest(addModule) {
# it may not build.
addModule(qtbase)
+addModule(qtandroidextras, qtbase)
addModule(qtmacextras, qtbase)
addModule(qtx11extras, qtbase)
addModule(qlalr, qtbase)
diff --git a/qtandroidextras b/qtandroidextras
new file mode 160000
+Subproject 6500083ceb9c9e63eb5ff544e91aa9d556c6739