Compare commits

...

5 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
aebccd2885 Update submodules on '5.13.2' in qt5
Change-Id: I28739af9410fcfe4431db88c736b47e3149775ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-10-28 05:10:40 +00:00
Qt Submodule Update Bot
39b7b63d5b Update submodules on '5.13.2' in qt5
Change-Id: I6ca4d856a37763191c8c9f1126c5a3814d6bbd37
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-10-16 12:05:43 +00:00
Qt Submodule Update Bot
6d12189f0c Update submodules on '5.13.2' in qt/qt5
Change-Id: Iba6d73291117085f2175415be7545219442165bd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-09 23:28:04 +02:00
Edward Welbourne
27ecf13595 Remove execute permissions from scripts not run on Unix
This amends 38e416be66.

Change-Id: I8b0f4f72565b30b097cb36092f7cb90d61c1487e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-07 17:21:12 +00:00
Frederik Gladhorn
78cdf36832 Adjust submodule branches
Change-Id: Ie21cb35574298ed077e5f8ce071aa94b7d2cd1d4
2019-10-03 21:20:04 +02:00
45 changed files with 82 additions and 82 deletions

80
.gitmodules vendored
View File

@@ -1,60 +1,60 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.13
branch = 5.13.2
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.13
branch = 5.13.2
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.13
branch = 5.13.2
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.13
branch = 5.13.2
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 5.13
branch = 5.13.2
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.13
branch = 5.13.2
status = deprecated
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.13
branch = 5.13.2
status = essential
priority = 30
[submodule "qtdoc"]
@@ -62,7 +62,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
branch = 5.13
branch = 5.13.2
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -83,14 +83,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -123,99 +123,99 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
branch = 5.13
branch = 5.13.2
status = addon
priority = 10
[submodule "qtcanvas3d"]
@@ -229,86 +229,86 @@
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.13
branch = 5.13.2
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 5.13
branch = 5.13.2
status = addon
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = 5.13
branch = 5.13.2
status = preview

0
coin/provisioning/common/windows/emsdk.ps1 Executable file → Normal file
View File

0
coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 Executable file → Normal file
View File

2
qt3d

Submodule qt3d updated: c40cccb0b4...93361f1a59

2
qtbase

Submodule qtbase updated: 46201f0e82...a7a24784ee

2
qtdoc

Submodule qtdoc updated: b52984369d...bf9557850e

2
qtqa

Submodule qtqa updated: e50ae95cdf...97a4384354

Submodule qtscxml updated: a57befb1da...575d92175a

2
qtsvg

Submodule qtsvg updated: de830ffd45...582bbf973f

Submodule qttools updated: c8e7929423...78f52a4027