diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-06-02 09:23:37 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-06-02 09:23:37 -0700 |
| commit | fa9e5adddda0bee5adc040b957cf3f1a6a470802 (patch) | |
| tree | 0335a4ae78da38c39ef8447476686c003ee4ab67 /src/qt/bitcoin.cpp | |
| parent | 50b4086a4a4fbba8241c4b8807870d7b44c109fe (diff) | |
| parent | 80fccb0eb3756af5385460d9008b9b8b17b7cda5 (diff) | |
Merge pull request #2672 from Diapolo/Qt_testnet
Bitcoin-Qt: setup testnet GUI directly
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index b858e1c174..9bcac59798 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -15,9 +15,6 @@ #include "ui_interface.h" #include "paymentserver.h" #include "splashscreen.h" -#ifdef Q_OS_MAC -#include "macdockiconhandler.h" -#endif #include <QMessageBox> #if QT_VERSION < 0x050000 @@ -205,14 +202,6 @@ int main(int argc, char *argv[]) return 1; } -#ifdef Q_OS_MAC - // on mac, also change the icon now because it would look strange to have a testnet splash (green) and a std app icon (orange) - if(GetBoolArg("-testnet", false)) - { - MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet")); - } -#endif - SplashScreen splash(QPixmap(), 0); if (GetBoolArg("-splash", true) && !GetBoolArg("-min", false)) { @@ -232,7 +221,7 @@ int main(int argc, char *argv[]) boost::thread_group threadGroup; - BitcoinGUI window; + BitcoinGUI window(GetBoolArg("-testnet", false), 0); guiref = &window; QTimer* pollShutdownTimer = new QTimer(guiref); |