From f46f85b0c7a3f6a860569d5c2b36031c1cfe494f Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 9 Aug 2019 16:22:35 +0200 Subject: [PATCH] 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 --- .gitmodules | 2 +- qtbase | 2 +- 2 files changed, 2 insertions(+), 2 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 diff --git a/qtbase b/qtbase index f44850b5..6132260d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 +Subproject commit 6132260da394a9627947f0fe6a279c20863b6ad2