aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.commit-template6
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository3
-rw-r--r--qt.pro5
m---------qtandroidextras0
6 files changed, 13 insertions, 5 deletions
diff --git a/.commit-template b/.commit-template
index b7c00b82..0aef528f 100644
--- a/.commit-template
+++ b/.commit-template
@@ -6,15 +6,15 @@
# ==[ Footers: Uncomment and edit where applicable ]===================|
#
+# Change log entry (see below for instructions).
+#[ChangeLog][][]
+#
# One task per entry. Remember space after colon.
#Task-number:
#
# Solicit reviewers. They still need to use the Gerrit frontend.
#Reviewed-by:
#
-# Change log entry (see below for instructions).
-#[ChangeLog][][]
-#
# ==[ Please wrap at 72 characters ]===================================|
#
# Remember to read http://wiki.qt-project.org/Commit_Policy
diff --git a/.gitignore b/.gitignore
index 7bd3d3d6..d5a0a45c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
Makefile
.qmake.cache
+.qmake.super
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 f662fb5c..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,12 +237,14 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
my @DEFAULT_REPOS = qw(
qtactiveqt
+ qtandroidextras
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
+ qtmacextras
qtmultimedia
qtqa
qtquick1
diff --git a/qt.pro b/qt.pro
index 724967dd..b92b3c69 100644
--- a/qt.pro
+++ b/qt.pro
@@ -54,22 +54,23 @@ defineTest(addModule) {
# it may not build.
addModule(qtbase)
+addModule(qtandroidextras, qtbase)
addModule(qtmacextras, qtbase)
addModule(qtx11extras, qtbase)
addModule(qlalr, qtbase)
addModule(qtsvg, qtbase)
addModule(qtxmlpatterns, qtbase)
addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
-addModule(qtwinextras, qtbase, qtdeclarative)
addModule(qtquickcontrols, qtdeclarative)
addModule(qtmultimedia, qtdeclarative)
+addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
addModule(qtactiveqt, qtbase)
addModule(qt3d, qtdeclarative)
addModule(qtjsondb, qtdeclarative)
addModule(qtsystems, qtbase, qtdeclarative)
addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtsystems)
+addModule(qtconnectivity, qtbase, qtdeclarative)
addModule(qtfeedback, qtdeclarative, qtmultimedia)
addModule(qtpim, qtdeclarative, qtjsondb)
addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)
diff --git a/qtandroidextras b/qtandroidextras
new file mode 160000
+Subproject 467e7b9f4f7d723ead59eaf835cb741c091ed83