From f99d5e8b78c7a7eb96673db3942015681c8a4fa4 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 6 Sep 2019 11:02:01 +0200 Subject: [PATCH] Re-enable qttools for use with cmake Change-Id: I040b8769af22290a986ccac476f30e7eed78b3e4 Reviewed-by: Liang Qi --- .gitmodules | 4 ++-- qttools | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 640f73ff..3c8b4eb6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,8 +27,8 @@ recommends = qttools path = qtscript url = ../qtscript.git - branch = dev - status = ignore + branch = wip/cmake + status = essential [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative diff --git a/qttools b/qttools index 7e355162..7292c4ed 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7e355162ca7566df29045d4fa25fed74c97f3bae +Subproject commit 7292c4ed1076c252a30d16557585ceb8fac2248b