diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-03-16 09:05:23 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-03-16 09:05:26 +0100 |
| commit | 8e6532053f580003869346510fc1dc20c46c8067 (patch) | |
| tree | b7a10772641d751b271351ce470efda33a2f04e4 | |
| parent | 4ba1bab44390090a939d5ab2dee1440330f9a2d7 (diff) | |
| parent | 77833a364a09c463e088069faf4d32dc5cea7242 (diff) | |
| download | bitcoin-8e6532053f580003869346510fc1dc20c46c8067.tar.xz | |
Merge bitcoin-core/gui#246: Revert "qt: Use "fusion" style on macOS Big Sur with old Qt"
77833a364a09c463e088069faf4d32dc5cea7242 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 https://github.com/bitcoin-core/gui/pull/246/commits/77833a364a09c463e088069faf4d32dc5cea7242. Tested on macOS Big Sur v11.2.3
jarolrod:
ACK 77833a364a09c463e088069faf4d32dc5cea7242
Talkless:
utACK 77833a364a09c463e088069faf4d32dc5cea7242
Tree-SHA512: f704f2027dd380dfc604231e3606a036a8be891aeeddf643c474131014fa080e123b42836ac643a2064fe7a5a018fa8b9aa61a31f9da1d15880de6a36c4c0d54
| -rw-r--r-- | src/qt/bitcoin.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index f25b415820..791a29f7a0 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -52,7 +52,6 @@ #include <QThread> #include <QTimer> #include <QTranslator> -#include <QtGlobal> #if defined(QT_STATICPLUGIN) #include <QtPlugin> @@ -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"); |