diff --git a/src/libs/utils/tooltip/tips.cpp b/src/libs/utils/tooltip/tips.cpp
index 180b8f960f2..5f0a1ed42d5 100644
--- a/src/libs/utils/tooltip/tips.cpp
+++ b/src/libs/utils/tooltip/tips.cpp
@@ -5,6 +5,7 @@
 #include "tooltip.h"
 
 #include "../qtcassert.h"
+#include "../hostosinfo.h"
 
 #include <QColor>
 #include <QFontMetrics>
@@ -249,7 +250,8 @@ void WidgetTip::configure(const QPoint &pos)
     move(pos);
     m_layout->addWidget(m_widget);
     m_layout->setSizeConstraint(QLayout::SetFixedSize);
-    adjustSize();
+    if (!HostOsInfo::isMacHost()) // work around QTBUG-131479
+        adjustSize();
 }
 
 void WidgetTip::pinToolTipWidget(QWidget *parent)
diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index bdea5b9f1e6..479b5d11d44 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -463,6 +463,7 @@ DebuggerToolTipWidget::DebuggerToolTipWidget(DebuggerEngine *engine,
     auto mainLayout = new QVBoxLayout(this);
     mainLayout->setSizeConstraint(QLayout::SetFixedSize);
     mainLayout->setContentsMargins(0, 0, 0, 0);
+    mainLayout->setSpacing(0);
     mainLayout->addWidget(toolBar);
     mainLayout->addWidget(treeView);