Commit fa12e851 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau

Merge branch '5.5'

parents 7ef07a35 d6d3a996
......@@ -484,7 +484,7 @@ ProjectFolderItem *AbstractFileManagerPlugin::import( IProject *project )
// set up the signal handling
// NOTE: We delay handling of the creation/deletion events here by one second to prevent
// useless or even outright wrong handling of events during comming git workflows.
// useless or even outright wrong handling of events during common git workflows.
// I.e. sometimes we used to get a 'delete' event during a rebase which was never
// followed up by a 'created' signal, even though the file actually exists after
// the rebase.
......
......@@ -66,7 +66,7 @@ QString ColorSchemeChooser::loadCurrentScheme() const
#if KCONFIGWIDGETS_VERSION >= QT_VERSION_CHECK(5, 67, 0)
// Since 5.67 KColorSchemeManager includes a system color scheme option that reacts to system
// scheme changes. This scheme will be activated if we pass an empty string to KColorSchemeManager
// So no need anymore to read the the current global scheme ourselves if no custom one is configured.
// So no need anymore to read the current global scheme ourselves if no custom one is configured.
return cg.readEntry("ColorScheme");
#else
return cg.readEntry("ColorScheme", currentDesktopDefaultScheme());
......
......@@ -768,7 +768,7 @@ void UiController::showErrorMessage(const QString& message, int timeout)
void UiController::postMessage(Sublime::Message* message)
{
// if Core has flag Core::NoUi there also is no window, so catched as well here
// if Core has flag Core::NoUi there also is no window, so caught as well here
Sublime::MainWindow* window = activeSublimeWindow();
if (!window) {
delete message;
......
......@@ -119,8 +119,7 @@ QSize IdealToolButton::minimumSizeHint() const
minimumSize = fm.size(Qt::TextShowMnemonic, opt.text.left(4));
}
minimumSize = style()->sizeFromContents(QStyle::CT_ToolButton, &opt, minimumSize, this).
expandedTo(QApplication::globalStrut());
minimumSize = style()->sizeFromContents(QStyle::CT_ToolButton, &opt, minimumSize, this);
if (_area == Qt::TopDockWidgetArea || _area == Qt::BottomDockWidgetArea) {
return minimumSize;
......
......@@ -396,7 +396,7 @@ public:
changes.applyAllChanges();
// Place cursor after the opening brace
// arbitrarily chose 4, as it would accomodate the template and return types on their own line
// arbitrarily chose 4, as it would accommodate the template and return types on their own line
const auto searchRange = KTextEditor::Range(rangeStart, rangeStart.line() + 4, 0);
const auto results = view->document()->searchText(searchRange, QStringLiteral("{"));
if (!results.isEmpty()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment