Compare commits

...

18 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
5b7def1433 Update submodules on '5.8' in qt5
Change-Id: I457d16bb5c82d98dfc0995e84c08fee89d872e89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-01 03:23:21 +00:00
Qt Submodule Update Bot
70361aac02 Update submodules on '5.8' in qt5
Change-Id: I165c8b4ae2709d009462b7fa5b91561759524e5f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-08-29 04:29:14 +00:00
Qt Submodule Update Bot
85771ddaaa Update submodules on '5.8' in qt5
Change-Id: I558721d2b7a630453ce794e7b7b97e1fca5ef3dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-08-28 17:43:30 +00:00
Simon Hausmann
31d8277404 Remove qtsystems from the list of recommended modules in qtlocation
QtSystems is not a supported module at the moment, and the code in
QtLocation to utilize QtSystems is behind an #ifdef and destined for
removal.

Change-Id: Ide44f138638ccd751044c13c289f1e116641a23e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2016-08-28 17:43:26 +00:00
Qt Submodule Update Bot
7831d61e82 Update submodules on '5.8' in qt5
Change-Id: I188c217abff06c901f6da7561bc7ed1f3c12d8b1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-08-24 18:02:48 +00:00
Jani Heikkinen
56fc6bc77b Removed TP status from qtscxml and qtserialbus
Change-Id: I8ed4edcdf9eab48ec1ac278d3e8de38149b0fd8d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-24 18:02:44 +00:00
Oswald Buddenhagen
71524c78f6 Merge remote-tracking branch 'origin/dev' into 5.8
Note that this also contains the adjustment of the branch for the
latecomers qtspeech and qtnetworkauth.

Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
2016-08-24 19:54:10 +02:00
Jesus Fernandez
b78f3579af Add qtnetworkauth
Change-Id: I4cd81725d0aec29ff3252a84504a81a44d1b60eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-08-22 09:03:20 +00:00
Frederik Gladhorn
80ee813a03 Make QtSpeech a tech preview release for Qt 5.8
Change-Id: I144109a45bece4b2283c24ad7aae64c098f86963
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2016-08-17 08:37:40 +00:00
Qt Submodule Update Bot
9410b99b16 Update submodules on 'dev' in qt5
Change-Id: Ie425f3f5a64e83702a6987d2892fbfa68bea5844
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-17 07:26:42 +00:00
Oswald Buddenhagen
7efeb26af7 Adjust submodule branches
Change-Id: I6e8c8e91b7e17efa93b24e8026fa3f340bd10e9d
2016-08-08 11:06:22 +02:00
Liang Qi
23f5d41bec Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I91cf0b6132a73c34c63d83a0bee1c028f2f819f8
2016-08-06 06:20:21 +02:00
Qt Submodule Update Bot
525a85bd6d Update submodules on 'dev' in qt5
Change-Id: I5c05b788003c8c274914ad5533d1eb7971c6e823
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-05 18:20:17 +00:00
Qt Submodule Update Bot
acf5c9d0ff Updated submodules
Change-Id: Ie27b2f6daddc68e72b09d779beaf1f61a8a29aa6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-07-02 20:55:05 +00:00
Qt Submodule Update Bot
ca7708f22e Updated submodules
Change-Id: I64b5898838652d6a785a45136947f7d55fa3d3f1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-06-30 07:46:13 +00:00
Frederik Gladhorn
f4c6a9c97c Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev 2016-06-28 15:58:17 +00:00
Qt Submodule Update Bot
f78835e062 Updated submodules.
Change-Id: I12a0a7f2f8174541a1d3c572478c3d0fb765a35d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-06-28 15:58:12 +00:00
Liang Qi
39a03d3d6a Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
2016-06-24 07:10:02 +02:00
49 changed files with 102 additions and 94 deletions

101
.gitmodules vendored
View File

@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.7
branch = 5.8
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.7
branch = 5.8
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.7
branch = 5.8
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.7
branch = 5.8
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt qtwebkit
path = qttools
url = ../qttools.git
branch = 5.7
branch = 5.8
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.7
branch = 5.8
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
branch = 5.7
branch = 5.8
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -74,7 +74,7 @@
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
path = qtwebkit
url = ../qtwebkit.git
branch = 5.7
branch = 5.8
status = obsolete
project = WebKit.pro
priority = 20
@@ -82,7 +82,7 @@
depends = qtwebkit qttools
path = qtwebkit-examples
url = ../qtwebkit-examples.git
branch = 5.7
branch = 5.8
status = obsolete
[submodule "qtqa"]
depends = qtbase
@@ -93,24 +93,24 @@
priority = 50
[submodule "qtlocation"]
depends = qtbase
recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
recommends = qtdeclarative qtquickcontrols qtserialport
path = qtlocation
url = ../qtlocation.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtsystems"]
depends = qtbase
recommends = qtdeclarative
path = qtsystems
url = ../qtsystems.git
branch = 5.7
branch = dev
status = ignore
[submodule "qtfeedback"]
depends = qtdeclarative
@@ -129,184 +129,191 @@
depends = qtdeclarative
path = qtpim
url = ../qtpim.git
branch = 5.7
branch = dev
status = ignore
[submodule "qtconnectivity"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qt3d"]
depends = qtdeclarative qtimageformats
recommends = qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtsvg qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = 5.7
branch = dev
status = ignore
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.7
branch = 5.8
status = essential
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.7
status = preview
branch = 5.8
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
path = qtenginio
url = ../qtenginio.git
branch = 5.7
branch = dev
status = ignore
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation
path = qtwebengine
url = ../qtwebengine.git
branch = 5.7
branch = 5.8
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.7
branch = 5.8
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad
branch = 5.7
branch = 5.8
status = preview
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml
branch = 5.7
status = preview
branch = 5.8
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech
branch = dev
status = ignore
branch = 5.8
status = preview
[submodule "qtnetworkauth"]
depends = qtbase
recommends = qtwebview
path = qtnetworkauth
url = ../qtnetworkauth
branch = 5.8
status = preview

2
qt3d

Submodule qt3d updated: db3baec236...5688464a38

2
qtbase

Submodule qtbase updated: dbfd7f304c...982f17e961

2
qtdoc

Submodule qtdoc updated: a684f23ecb...cb23e64e86

1
qtnetworkauth Submodule

Submodule qtnetworkauth added at 0cb5de9c28

2
qtpim

Submodule qtpim updated: de4cfc6b53...02efef5ee6

2
qtqa

Submodule qtqa updated: bedd8eaf5d...1c973844b7

Submodule qtscxml updated: a3bfb9e792...90b000155e

2
qtsvg

Submodule qtsvg updated: 55825068ab...4c44cffd7b

Submodule qttools updated: cb72077e56...89d766d653