Merge pull request #1915 from Diapolo/Qt5_compat_leftover

change Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility)
This commit is contained in:
Wladimir J. van der Laan 2012-10-08 22:28:24 -07:00
commit 0a5ce30bc1

View File

@ -139,7 +139,7 @@ void OptionsDialog::setMapper()
mapper->addMapping(ui->socksVersion, OptionsModel::ProxySocksVersion); mapper->addMapping(ui->socksVersion, OptionsModel::ProxySocksVersion);
/* Window */ /* Window */
#ifndef Q_WS_MAC #ifndef Q_OS_MAC
mapper->addMapping(ui->minimizeToTray, OptionsModel::MinimizeToTray); mapper->addMapping(ui->minimizeToTray, OptionsModel::MinimizeToTray);
mapper->addMapping(ui->minimizeOnClose, OptionsModel::MinimizeOnClose); mapper->addMapping(ui->minimizeOnClose, OptionsModel::MinimizeOnClose);
#endif #endif