Skip to content

Commit

Permalink
Merge bitcoin-core/gui#246: Revert "qt: Use "fusion" style on macOS B…
Browse files Browse the repository at this point in the history
…ig 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 #177.

  After bumping Qt version in depends to 5.12.10 in bitcoin/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
  • Loading branch information
MarcoFalke committed Mar 16, 2021
2 parents 4ba1bab + 77833a3 commit 8e65320
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/qt/bitcoin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#include <QThread>
#include <QTimer>
#include <QTranslator>
#include <QtGlobal>

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

#if (QT_VERSION <= QT_VERSION_CHECK(5, 9, 8)) && defined(Q_OS_MACOS)
const auto os_name = QSysInfo::prettyProductName();
if (os_name.startsWith("macOS 11") || os_name.startsWith("macOS 10.16")) {
QApplication::setStyle("fusion");
}
#endif

BitcoinApplication app;
QFontDatabase::addApplicationFont(":/fonts/monospace");

Expand Down

0 comments on commit 8e65320

Please sign in to comment.