From 4165d1605380e9ad15f3ddbf7c96151fd174ff34 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 28 Feb 2020 11:32:58 +0100 Subject: [PATCH 1/2] Core: Fix rounding issue in highlight scrollbar Fixes: QTCREATORBUG-23660 Change-Id: Ifcaf4e705a0a037c58ffedf36605b3eecfc698de Reviewed-by: Eike Ziller --- src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp index b9d07b70da4..18c80c11cd6 100644 --- a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp +++ b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp @@ -127,8 +127,8 @@ void HighlightScrollBarOverlay::paintEvent(QPaintEvent *paintEvent) const int aboveValue = m_scrollBar->value(); const int belowValue = m_scrollBar->maximum() - m_scrollBar->value(); - const int sizeDocAbove = aboveValue * int(m_highlightController->lineHeight()); - const int sizeDocBelow = belowValue * int(m_highlightController->lineHeight()); + const int sizeDocAbove = int(aboveValue * m_highlightController->lineHeight()); + const int sizeDocBelow = int(belowValue * m_highlightController->lineHeight()); const int sizeDocVisible = int(m_highlightController->visibleRange()); const int scrollBarBackgroundHeight = aboveHandleRect.height() + belowHandleRect.height(); From 8e47fc18a686525ac77bc565693b87b2e37e9735 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 3 Mar 2020 12:23:04 +0100 Subject: [PATCH 2/2] CMake: Pick Ninja generator when installer added ninja Pick the Ninja CMake generator when the installer has installed the ninja binary. Task-number: QTCREATORBUG-23650 Change-Id: I966b369513e7d489161b210819832f1bbbb5a0fc Reviewed-by: Eike Ziller --- .../cmakekitinformation.cpp | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 26e4bffdebb..fec65537abf 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -25,8 +25,10 @@ #include "cmakekitinformation.h" #include "cmakeprojectconstants.h" -#include "cmaketoolmanager.h" +#include "cmakeprojectplugin.h" +#include "cmakespecificsettings.h" #include "cmaketool.h" +#include "cmaketoolmanager.h" #include #include @@ -613,10 +615,19 @@ QVariant CMakeGeneratorKitAspect::defaultValue(const Kit *k) const return g.matches("Ninja", extraGenerator); }); if (it != known.constEnd()) { - Utils::Environment env = Utils::Environment::systemEnvironment(); - k->addToEnvironment(env); - const Utils::FilePath ninjaExec = env.searchInPath(QLatin1String("ninja")); - if (!ninjaExec.isEmpty()) + const bool hasNinja = [k]() { + Internal::CMakeSpecificSettings *settings + = Internal::CMakeProjectPlugin::projectTypeSpecificSettings(); + + if (settings->ninjaPath().isEmpty()) { + Utils::Environment env = Utils::Environment::systemEnvironment(); + k->addToEnvironment(env); + return !env.searchInPath("ninja").isEmpty(); + } + return true; + }(); + + if (hasNinja) return GeneratorInfo({QString("Ninja"), extraGenerator, QString(), QString()}).toVariant(); }