From 6b4472f1899479b3ae527f56fc26be278be30eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 20 Sep 2021 16:35:28 +0200
Subject: [PATCH] Fix Compatibility with Qt6 (#2767)

---
 src/widgets/HeapBinsGraphView.cpp | 4 ++--
 src/widgets/HeapDockWidget.cpp    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/widgets/HeapBinsGraphView.cpp b/src/widgets/HeapBinsGraphView.cpp
index 320938ee..0e61ae02 100644
--- a/src/widgets/HeapBinsGraphView.cpp
+++ b/src/widgets/HeapBinsGraphView.cpp
@@ -195,7 +195,7 @@ void HeapBinsGraphView::addBlock(GraphLayout::GraphBlock block, const QString &t
     double width = 0;
 
     // split text into different lines
-    auto lines = text.split(QRegExp("[\n]"), QString::SkipEmptyParts);
+    auto lines = text.split("\n", CUTTER_QT_SKIP_EMPTY_PARTS);
 
     // width of the block is the maximum width of a line
     for (QString &line : lines) {
@@ -226,4 +226,4 @@ void HeapBinsGraphView::blockContextMenuRequested(GraphView::GraphBlock &block,
         addressableItemContextMenu.exec(pos);
         event->accept();
     }
-}
\ No newline at end of file
+}
diff --git a/src/widgets/HeapDockWidget.cpp b/src/widgets/HeapDockWidget.cpp
index 428fb52a..d30ca0b5 100644
--- a/src/widgets/HeapDockWidget.cpp
+++ b/src/widgets/HeapDockWidget.cpp
@@ -8,7 +8,7 @@ HeapDockWidget::HeapDockWidget(MainWindow *main)
     ui->setupUi(this);
 
     ui->allocatorSelector->addItem("Glibc Heap");
-    ui->verticalLayout->setMargin(0);
+    ui->verticalLayout->setContentsMargins(0, 0, 0, 0);
 
     connect<void (QComboBox::*)(int)>(ui->allocatorSelector, &QComboBox::currentIndexChanged, this,
                                       &HeapDockWidget::onAllocatorSelected);