From f4e80ea688cd1b35b35d8247f819b047517f4cdc Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 5 Dec 2019 15:47:24 +0100 Subject: [PATCH] Clear QT_KNOWN_MODULE_${module}_TOOLS cache vars on reconfiguration Otherwise if you configured a commit that has tool A, and the switch to a commit where tool A does not exist anymore, reconfiguration will fail. Change-Id: Ibb244b9630a6f4fecd27d51ce28eceff07ba8666 Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor --- cmake/QtBuild.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index cf4e56ca19c..fa71968ae18 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -212,6 +212,8 @@ macro(qt_internal_append_known_modules_with_tools module) if(NOT ${module} IN_LIST QT_KNOWN_MODULES_WITH_TOOLS) set(QT_KNOWN_MODULES_WITH_TOOLS "${QT_KNOWN_MODULES_WITH_TOOLS};${module}" CACHE INTERNAL "Known Qt modules with tools" FORCE) + set(QT_KNOWN_MODULE_${module}_TOOLS "" + CACHE INTERNAL "Known Qt module ${module} tools" FORCE) endif() endmacro()