aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-08-09 16:22:35 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-08-10 00:17:47 +0200
commitf46f85b0c7a3f6a860569d5c2b36031c1cfe494f (patch)
tree7b6f68e033e043511f78c3c50357b566bfa6ee7e /.gitmodules
parent3e396d5ef17c9a62a4da5ab4bba3713393ca61c5 (diff)
Update qt5 wip/qt6
Point qtbase to latest wip/qt6. Temporarily disable building qt3d because it fails with the new qtbase version, but updating it with old SHA1 of qtbase is also not possible. Change-Id: I232920be48f01608f196c24370c684eccbd3994f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index cfd15d9a..9220ee7a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -138,7 +138,7 @@
path = qt3d
url = ../qt3d.git
branch = wip/qt6
- status = addon
+ status = ignore
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats