diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-10-16 12:39:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-16 12:39:27 +0200 |
| commit | 4c925babf9e7f516479a0e418e9b3f509d3cd4b7 (patch) | |
| tree | e7bc8bd3706d6e7b726025708bc77150fda773ec | |
| parent | d00002337613fa6681aed81193565ed7a5a4e472 (diff) | |
| parent | 38b7c75f6b2057a1eaf1fd79f175c256513d8b1f (diff) | |
| download | qt5-4c925babf9e7f516479a0e418e9b3f509d3cd4b7.tar.gz | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
| -rw-r--r-- | .commit-template | 6 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | init-repository | 3 | ||||
| -rw-r--r-- | qt.pro | 5 | ||||
| m--------- | qtandroidextras | 0 |
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 @@ -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 @@ -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 |