Merge remote-tracking branch 'origin/4.9'

Change-Id: I7bdb6a4658c5fca1a7e1dda5adbb5613dabc6d18
2019-02-19 09:08:53 +01:00
parent bfa53a8080 29492ecf24
commit 6d43aaf134
50 changed files with 817 additions and 328 deletions
--- a/src/plugins/texteditor/textmark.cpp
+++ b/src/plugins/texteditor/textmark.cpp
@@ -291,6 +291,9 @@ void TextMark::addToToolTipLayout(QGridLayout *target) const
    // Right column: action icons/button
    if (!m_actions.isEmpty()) {
        auto actionsLayout = new QHBoxLayout;
+        QMargins margins = actionsLayout->contentsMargins();
+        margins.setLeft(margins.left() + 5);
+        actionsLayout->setContentsMargins(margins);
        for (QAction *action : m_actions) {
            QTC_ASSERT(!action->icon().isNull(), continue);
            auto button = new QToolButton;