Mercurial > hg > bitcoin
changeset 3610:eb2790dc6d37 draft
Merge pull request #1915 from Diapolo/Qt5_compat_leftover
change Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility)
author | Wladimir J. van der Laan <laanwj@gmail.com> |
---|---|
date | Mon, 08 Oct 2012 22:28:24 -0700 |
parents | 2efc7e0a7ad7 (current diff) ac8d4b1e089a (diff) |
children | 5308ff68698a |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -139,7 +139,7 @@ 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