From 13f466c05d779504e04be97a8767e49e000a152c Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Mon, 22 Feb 2021 22:03:44 +0100 Subject: [PATCH 1/2] cmake build: Explicitly turn on project file updates on the QtC side We want to have flags consistent with the Qbs build and project file updates are disabled by default (for standalone qbs builds in Brew or choco) to avoid dependency on QtGui Task-number: QTCREATORBUG-25232 Change-Id: I217057f45519e0c92201d1b76d5b04924804aed0 Reviewed-by: Eike Ziller --- src/shared/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index cbf076479f0..6101e2a46c0 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -37,6 +37,7 @@ if (ENABLE_BUILD_QBS) set(INSTALL_PUBLIC_HEADERS OFF CACHE BOOL "") set(WITH_TESTS OFF) + set(WITH_PROJECT_FILE_UPDATES ON) set(QBS_INSTALL_QCH_DOCS ${WITH_DOCS} CACHE BOOL "") add_subdirectory(qbs) endif() From d8a35381cf3c0cb8d994e502b1ecd15374fe0750 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 23 Feb 2021 09:23:15 +0100 Subject: [PATCH 2/2] Update 4.14.1 change log Change-Id: I988aebbd52c4c6ce8b09c49ee3cd63dc63ec9513 Reviewed-by: Leena Miettinen --- dist/changes-4.14.1.md | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/changes-4.14.1.md b/dist/changes-4.14.1.md index b019dd205fb..7e0dd10a98b 100644 --- a/dist/changes-4.14.1.md +++ b/dist/changes-4.14.1.md @@ -72,6 +72,7 @@ Debugging ### LLDB * Fixed that application output could be printed delayed (QTCREATORBUG-24667) +* Fixed performance issue (QTCREATORBUG-25185, QTCREATORBUG-25217) ### CDB