diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 13:15:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 13:24:54 +0200 |
| commit | 5ef4ad5e90e86731542a5620dc500ec4da40c9d6 (patch) | |
| tree | ee798e10633f87253b389410f2b5343582d29702 /.gitmodules | |
| parent | a2dc8d6c2141bce84fe9619d5ee6851e73de8a95 (diff) | |
| parent | df53ff5f85f69932538cc1c571b86b0c2a885a10 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmakewip/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
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index d98947bf..ea697b07 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 |