Skip to content

Commit 8e65320

Browse files
author
MarcoFalke
committed
Merge bitcoin-core/gui#246: Revert "qt: Use "fusion" style on macOS Big Sur with old Qt"
77833a3 Revert "qt: Use "fusion" style on macOS Big Sur with old Qt" (Hennadii Stepanov) Pull request description: This PR reverts workaround introduced in bitcoin#177. After bumping Qt version in depends to 5.12.10 in bitcoin#21376, there are no reasons to use the Fusion style on macOS. ACKs for top commit: leonardojobim: tACK bitcoin-core/gui@77833a3. Tested on macOS Big Sur v11.2.3 jarolrod: ACK 77833a3 Talkless: utACK 77833a3 Tree-SHA512: f704f2027dd380dfc604231e3606a036a8be891aeeddf643c474131014fa080e123b42836ac643a2064fe7a5a018fa8b9aa61a31f9da1d15880de6a36c4c0d54
2 parents 4ba1bab + 77833a3 commit 8e65320

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/qt/bitcoin.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
#include <QThread>
5353
#include <QTimer>
5454
#include <QTranslator>
55-
#include <QtGlobal>
5655

5756
#if defined(QT_STATICPLUGIN)
5857
#include <QtPlugin>
@@ -467,13 +466,6 @@ int GuiMain(int argc, char* argv[])
467466
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
468467
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
469468

470-
#if (QT_VERSION <= QT_VERSION_CHECK(5, 9, 8)) && defined(Q_OS_MACOS)
471-
const auto os_name = QSysInfo::prettyProductName();
472-
if (os_name.startsWith("macOS 11") || os_name.startsWith("macOS 10.16")) {
473-
QApplication::setStyle("fusion");
474-
}
475-
#endif
476-
477469
BitcoinApplication app;
478470
QFontDatabase::addApplicationFont(":/fonts/monospace");
479471

0 commit comments

Comments
 (0)