diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-28 15:20:14 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-31 09:35:18 +0200 |
| commit | eec77574459dcbd8d59d8dbd35125eb1e3ec1a2e (patch) | |
| tree | 056a02aa9273bdb049286d409973299785d0cf1a /src/qt/intro.cpp | |
| parent | 1369d699b6221818dc9ca72eb6c0cea30eeee914 (diff) | |
| download | bitcoin-eec77574459dcbd8d59d8dbd35125eb1e3ec1a2e.tar.xz | |
qt: Introduce PlatformStyle
Introduce a PlatformStyle to handle platform-specific customization of
the UI.
This replaces 'scicon', as well as #ifdefs to determine whether to place
icons on buttons.
The selected PlatformStyle defaults to the platform that the application
was compiled on, but can be overridden from the command line with
`-uiplatform=<x>`.
Also fixes the warning from #6328.
Diffstat (limited to 'src/qt/intro.cpp')
| -rw-r--r-- | src/qt/intro.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 117969758c..4ab87e0f32 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -6,7 +6,6 @@ #include "ui_intro.h" #include "guiutil.h" -#include "scicon.h" #include "util.h" @@ -168,7 +167,7 @@ void Intro::pickDataDirectory() /* If current default data directory does not exist, let the user choose one */ Intro intro; intro.setDataDirectory(dataDir); - intro.setWindowIcon(SingleColorIcon(":icons/bitcoin")); + intro.setWindowIcon(QIcon(":icons/bitcoin")); while(true) { |