foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-09 10:43:19 -05:00
Code Issues Activity

Qt: remove macOS launch-at-startup option when compiled with > macOS 10.11

Browse source
This commit is contained in:
Jonas Schnelli 2019-01-18 21:47:01 -10:00
parent 63144335be
commit 516437a1b7
No known key found for this signature in database
GPG key ID: 1EB776BB03C7922D
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/release-notes.md
View file

@ -262,6 +262,12 @@ Graphical User Interface (GUI)
balance shown if the wallet was created using the `createwallet` RPC balance shown if the wallet was created using the `createwallet` RPC
and the `disable_private_keys` parameter was set to true. and the `disable_private_keys` parameter was set to true.
- The launch-on-startup option is no longer available on macOS if
compiled with macosx min version greater than 10.11 (use
CXXFLAGS="-mmacosx-version-min=10.11"
CFLAGS="-mmacosx-version-min=10.11" for setting the deployment
sdk version)
Low-level changes Low-level changes
================= =================

2
src/qt/guiutil.cpp
View file

@ -683,7 +683,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
} }
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC) && defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED <= 101100
// based on: https://github.com/Mozketo/LaunchAtLoginController/blob/master/LaunchAtLoginController.m // based on: https://github.com/Mozketo/LaunchAtLoginController/blob/master/LaunchAtLoginController.m
LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef findUrl); LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef findUrl);

6
src/qt/optionsdialog.cpp
View file

@ -74,6 +74,12 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
/* remove Window tab on Mac */ /* remove Window tab on Mac */
ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabWindow)); ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabWindow));
#if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED > 101100
/* hide launch at startup option if compiled against macOS > 10.11 (removed API) */
ui->bitcoinAtStartup->setVisible(false);
ui->verticalLayout_Main->removeWidget(ui->bitcoinAtStartup);
ui->verticalLayout_Main->removeItem(ui->horizontalSpacer_0_Main);
#endif
#endif #endif
/* remove Wallet tab in case of -disablewallet */ /* remove Wallet tab in case of -disablewallet */