Compare commits

...

10 Commits

Author SHA1 Message Date
Jani Heikkinen
bf3d2588cc Update submodules on '5.7.1' in qt5
Change-Id: I90aabdc6b865805960d1a1ecc77d95b89533088c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-01 18:44:17 +00:00
Qt Submodule Update Bot
9817f4a84c Update submodules on '5.7.1' in qt5
Change-Id: I5103ec34b35683e5815752904108ea3d5cf3c03c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-11-18 10:13:30 +00:00
Qt Submodule Update Bot
0150c62f60 Update submodules on '5.7.1' in qt5
Change-Id: I34632fb2c3976d8436e18550e47f83b362e5baf0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-11-13 08:09:58 +00:00
Qt Submodule Update Bot
1a6968113c Update submodules on '5.7.1' in qt5
Change-Id: I5dc802bd3d922a2764a72b66d1a361a162bda538
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-11-11 10:51:42 +00:00
Qt Submodule Update Bot
c09f683eda Update submodules on '5.7.1' in qt5
Change-Id: I278c257557262471c28d3c1d464609c557713f3d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-11-10 10:29:50 +00:00
Qt Submodule Update Bot
294ec185e4 Update submodules on '5.7.1' in qt5
Change-Id: Iba924441798e39ff2bd32aedcd1e28278bfe31f2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-11-01 04:09:34 +00:00
Liang Qi
f5fe555ec7 Update submodules on '5.7.1' in qt5
Change-Id: I992beddab9b28126d8fb2f0ca88d50d999074621
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-10-13 04:50:26 +00:00
Liang Qi
f8bed24b63 Merge remote-tracking branch 'origin/5.7' into 5.7.1
Change-Id: I354a221526e9b4d1f2d3b3a4d23fa560fa72fef9
2016-10-12 10:43:23 +02:00
Oswald Buddenhagen
4857e0313f fix qtbase branch
something went wrong while branching.

note that qtwebkit{,-examples} and qtquick1 were omitted intentionally,
as they are not considered worth branching at this point.

Change-Id: I5fb883b2d0ee017373c27688580c496c27d6ebc4
2016-10-07 11:19:08 +02:00
Frederik Gladhorn
1282fa3662 Adjust submodule branches
Change-Id: Id1e4d1d7ac63b12ba0a97d7dc6982a44a48a4ca5
2016-09-20 23:04:26 +03:00
23 changed files with 58 additions and 58 deletions

72
.gitmodules vendored
View File

@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.7
branch = 5.7.1
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.7
branch = 5.7.1
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.7
branch = 5.7.1
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.7
branch = 5.7.1
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt qtwebkit
path = qttools
url = ../qttools.git
branch = 5.7
branch = 5.7.1
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.7
branch = 5.7.1
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
branch = 5.7
branch = 5.7.1
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -96,14 +96,14 @@
recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
path = qtlocation
url = ../qtlocation.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -136,27 +136,27 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qt3d"]
depends = qtdeclarative qtimageformats
recommends = qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtquick1"]
depends = qtscript
@@ -169,51 +169,51 @@
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.7
branch = 5.7.1
status = essential
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.7
branch = 5.7.1
status = preview
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
@@ -226,82 +226,82 @@
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation
path = qtwebengine
url = ../qtwebengine.git
branch = 5.7
branch = 5.7.1
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtpurchasing"]
depends = qtbase qtandroidextras
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.7
branch = 5.7.1
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad
branch = 5.7
branch = 5.7.1
status = preview
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml
branch = 5.7
branch = 5.7.1
status = preview
[submodule "qtspeech"]
depends = qtbase

2
qt3d

Submodule qt3d updated: e7a846b61d...0eac16fbda

2
qtbase

Submodule qtbase updated: 3e71810cf3...a55f36211e

2
qtdoc

Submodule qtdoc updated: 2c2150c613...79ed30f70c

2
qtqa

Submodule qtqa updated: 66911ea5ba...cd6bd18319

Submodule qttools updated: ae9472a393...8575ed82ff