Merge remote-tracking branch 'origin/dev' into wip/cmake

Bringing in new SHA1s, and updated cmake-specific configurations.
Intended for Qt6 Installer essentials package creation.

Conflicts
        coin/platform_configs/default.yaml
        coin/platform_configs/qt5.yaml

Change-Id: I6abc2d952ae75785e34b70977e41018a72acf5bc
This commit is contained in:
Alexandru Croitor
2020-06-15 13:15:40 +02:00
56 changed files with 417 additions and 344 deletions

8
.gitmodules vendored
View File

@@ -68,8 +68,8 @@
depends = qtbase
path = qtqa
url = ../qtqa.git
branch = master
status = ignore
branch = dev
status = essential
priority = 50
[submodule "qtlocation"]
depends = qtbase
@@ -127,11 +127,11 @@
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
recommends = qtdeclarative qtshadertools
path = qt3d
url = ../qt3d.git
branch = dev
status = ignore
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats