From 3870adcbdf2703466955e817a6f848f1a1f57d70 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Mon, 25 Jun 2018 13:14:47 -0400 Subject: [PATCH] Merge #13536: [qt] coincontrol: Remove unused qt4 workaround faa2cf685a [qt] coincontrol: Remove unused qt4 workaround (MarcoFalke) Pull request description: This reverts 55eade9d46ebfa4b32b79893595d91d529fa30bb since it is no longer required. Tree-SHA512: ec523d505b410ab72ce9fdee86dfcfe96011472fb386744bb585169724270426ee65da2b527ae47928d604e1f21f54aa2b4b82f9a9d3fbfea1a6516478d81d11 (cherry picked from commit baf3a3ab0c63b512b37d9f753768c1f020369088) # Conflicts: # src/qt/coincontroldialog.cpp --- src/qt/coincontroldialog.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index ac298495ea..953b21cb16 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -126,10 +126,6 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidge // Toggle lock state connect(ui->pushButtonToggleLock, SIGNAL(clicked()), this, SLOT(buttonToggleLockClicked())); - // change coin control first column label due Qt4 bug. - // see https://github.com/bitcoin/bitcoin/issues/5716 - ui->treeWidget->headerItem()->setText(COLUMN_CHECKBOX, QString()); - ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, 84); ui->treeWidget->setColumnWidth(COLUMN_AMOUNT, 100); ui->treeWidget->setColumnWidth(COLUMN_LABEL, 170);