diff --git a/cmake/FindQt5.cmake b/cmake/FindQt5.cmake
index 2ace18f8eb1..589fd4eed50 100644
--- a/cmake/FindQt5.cmake
+++ b/cmake/FindQt5.cmake
@@ -59,7 +59,7 @@ foreach(comp IN LISTS Qt5_FIND_COMPONENTS)
 endforeach()
 
 # alias Qt6::Core5Compat to Qt6Core5Compat to make consistent with Qt5 path
-if (TARGET Qt6::Core5Compat AND NOT TARGET Qt6CoreCompat)
+if (TARGET Qt6::Core5Compat AND NOT TARGET Qt6Core5Compat)
   add_library(Qt6Core5Compat ALIAS Qt6::Core5Compat)
 endif()
 
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
index 535d69634bf..99c85e2d4a3 100644
--- a/coin/instructions/common_environment.yaml
+++ b/coin/instructions/common_environment.yaml
@@ -14,23 +14,9 @@ instructions:
       - type: EnvironmentVariable
         variableName: LLVM_BASE_URL
         variableValue: http://master.qt.io/development_releases/prebuilt/libclang/libclang-release_120-based
-
-  - type: Group
-    enable_if:
-      condition: property
-      property: target.compiler
-      in_values: [MSVC2019]
-    instructions:
       - type: EnvironmentVariable
-        variableName: MAKEFLAGS
-        variableValue: ""
-      - type: EnvironmentVariable
-        variableName: LLVM_INSTALL_DIR
-        variableValue: "{{.Env.LLVM_DYNAMIC_LIBS_100}}"
-        enable_if:
-          condition: property
-          property: target.arch
-          equals_value: X86
+        variableName: MACOSX_DEPLOYMENT_TARGET
+        variableValue: 10.14
 
   - type: PrependToEnvironmentVariable
     variableName: PATH
diff --git a/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore/qobjectdefs.h b/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore/qobjectdefs.h
index 15d19ea7b49..4c805777d37 100644
--- a/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore/qobjectdefs.h
+++ b/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore/qobjectdefs.h
@@ -58,7 +58,7 @@
 #  define Q_SLOT __attribute__((annotate("qt_slot")))
 #endif
 
-#define Q_PROPERTY(arg...) static_assert("Q_PROPERTY", #arg);
+#define Q_PROPERTY(arg...) static_assert(static_cast<bool>("Q_PROPERTY"), #arg);
 
 #define SIGNAL(arg) #arg
 #define SLOT(arg) #arg
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 21b776f8605..aa57a88c1f0 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -609,18 +609,22 @@ void CMakeBuildSystem::updateProjectData()
         if (newRoot) {
             setRootProjectNode(std::move(newRoot));
 
-            const FilePath buildDir = cmakeBuildConfiguration()->buildDirectory();
-            if (p->rootProjectNode()) {
+            if (QTC_GUARD(p->rootProjectNode())) {
                 const QString nodeName = p->rootProjectNode()->displayName();
                 p->setDisplayName(nodeName);
-            }
 
-            for (const CMakeBuildTarget &bt : qAsConst(m_buildTargets)) {
-                const QString buildKey = bt.title;
-                if (ProjectNode *node = p->findNodeForBuildKey(buildKey)) {
-                    if (auto targetNode = dynamic_cast<CMakeTargetNode *>(node))
-                        targetNode->setConfig(patchedConfig);
-                }
+                // set config on target nodes
+                const QSet<QString> buildKeys = Utils::transform<QSet>(m_buildTargets,
+                                                                       &CMakeBuildTarget::title);
+                p->rootProjectNode()->forEachProjectNode(
+                    [patchedConfig, buildKeys](const ProjectNode *node) {
+                        if (buildKeys.contains(node->buildKey())) {
+                            auto targetNode = const_cast<CMakeTargetNode *>(
+                                dynamic_cast<const CMakeTargetNode *>(node));
+                            if (QTC_GUARD(targetNode))
+                                targetNode->setConfig(patchedConfig);
+                        }
+                    });
             }
         }
     }
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 875c228ab57..a6bf33491a0 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -282,15 +282,17 @@ void ManhattanStyle::polish(QWidget *widget)
             widget->setContentsMargins(0, 0, 0, 0);
 
         widget->setAttribute(Qt::WA_LayoutUsesWidgetRect, true);
+        // So that text isn't cutoff in line-edits, comboboxes... etc.
+        const int height = qMax(StyleHelper::navigationWidgetHeight(), QApplication::fontMetrics().height());
         if (qobject_cast<QToolButton*>(widget) || qobject_cast<QLineEdit*>(widget)) {
             widget->setAttribute(Qt::WA_Hover);
-            widget->setMaximumHeight(StyleHelper::navigationWidgetHeight() - 2);
+            widget->setMaximumHeight(height - 2);
         } else if (qobject_cast<QLabel*>(widget)) {
             widget->setPalette(panelPalette(widget->palette(), lightColored(widget)));
         } else if (widget->property("panelwidget_singlerow").toBool()) {
-            widget->setFixedHeight(StyleHelper::navigationWidgetHeight());
+            widget->setFixedHeight(height);
         } else if (qobject_cast<QStatusBar*>(widget)) {
-            widget->setFixedHeight(StyleHelper::navigationWidgetHeight() + 2);
+            widget->setFixedHeight(height + 2);
         } else if (qobject_cast<QComboBox*>(widget)) {
             const bool isLightColored = lightColored(widget);
             QPalette palette = panelPalette(widget->palette(), isLightColored);
@@ -298,7 +300,7 @@ void ManhattanStyle::polish(QWidget *widget)
                 palette.setBrush(QPalette::All, QPalette::WindowText,
                                  creatorTheme()->color(Theme::ComboBoxTextColor));
             widget->setPalette(palette);
-            widget->setMaximumHeight(StyleHelper::navigationWidgetHeight() - 2);
+            widget->setMaximumHeight(height - 2);
             widget->setAttribute(Qt::WA_Hover);
         }
     }