aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2012-10-08 22:28:24 -0700
committerWladimir J. van der Laan <[email protected]>2012-10-08 22:28:24 -0700
commit0a5ce30bc17bcbaa6ecf8c6da89fbb35424cdc8f (patch)
tree8de51b07f4760bd17d82733dd7cd0e9410a14630 /src
parentMerge pull request #1834 from jgarzik/kickblocks (diff)
parentchange Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility) (diff)
downloaddiscoin-0a5ce30bc17bcbaa6ecf8c6da89fbb35424cdc8f.tar.xz
discoin-0a5ce30bc17bcbaa6ecf8c6da89fbb35424cdc8f.zip
Merge pull request #1915 from Diapolo/Qt5_compat_leftover
change Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility)
Diffstat (limited to 'src')
-rw-r--r--src/qt/optionsdialog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 8025126c2..3fb30a951 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -139,7 +139,7 @@ void OptionsDialog::setMapper()
mapper->addMapping(ui->socksVersion, OptionsModel::ProxySocksVersion);
/* Window */
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
mapper->addMapping(ui->minimizeToTray, OptionsModel::MinimizeToTray);
mapper->addMapping(ui->minimizeOnClose, OptionsModel::MinimizeOnClose);
#endif