ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-01-18 02:25:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix Compatibility with Qt6 (#2767)

Browse Source
This commit is contained in:
Florian Märkl 2021-09-20 16:35:28 +02:00 committed by GitHub
parent 7e68147eab
commit 6b4472f189
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/HeapBinsGraphView.cpp
View File

@ -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();
}
}
}

2
src/widgets/HeapDockWidget.cpp
View File

@ -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);