diff options
| author | Wladimir J. van der Laan <[email protected]> | 2018-06-05 15:47:25 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2018-06-05 15:48:50 +0200 |
| commit | 861de3b518ad5fc0a6882221683e85797ba34e2c (patch) | |
| tree | d5f187eca0caf6dbb79d8f3a570ba60e3ce080d8 /src | |
| parent | Merge #13191: Specialized double-SHA256 with 64 byte inputs with SSE4.1 and AVX2 (diff) | |
| parent | Rename “OS X” to the newer “macOS” convention (diff) | |
| download | discoin-861de3b518ad5fc0a6882221683e85797ba34e2c.tar.xz discoin-861de3b518ad5fc0a6882221683e85797ba34e2c.zip | |
Merge #13366: Docs: Rename “OS X” to the newer “macOS” convention
989c8990bb765eef45c8ee471f084ca81a0bead4 Rename “OS X” to the newer “macOS” convention (Giulio Lombardo)
Pull request description:
Since 2016, with [macOS 10.12 Sierra](https://en.wikipedia.org/wiki/MacOS_Sierra), Mac OS X has been renamed in macOS. It would be a nice if Bitcoin's macOS build instructions follow this naming convention to avoid misunderstandings.
Tree-SHA512: 51b7d54bfc39a1a9d0773c64780817c7beca7094aded80481086287474dfa272bf0a1dfa6ef6e3cae91548aa127f65fa730003dddcb97147cdc8c249146aea22
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/README.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/README.md b/src/qt/README.md index d8acf96ce..bf8139666 100644 --- a/src/qt/README.md +++ b/src/qt/README.md @@ -4,7 +4,7 @@ The current precise version for Qt 5 is specified in [qt.mk](/depends/packages/q ## Compile and run -See build instructions ([OSX](/doc/build-osx.md), [Windows](/doc/build-windows.md), [Unix](/doc/build-unix.md), etc). +See build instructions ([macOS](/doc/build-osx.md), [Windows](/doc/build-windows.md), [Unix](/doc/build-unix.md), etc). To run: @@ -65,7 +65,7 @@ Represents the view to a single wallet. * `guiconstants.h`: UI colors, app name, etc * `guiutil.h`: several helper functions * `macdockiconhandler.(h/cpp)` -* `macdockiconhandler.(h/cpp)`: display notifications in OSX +* `macdockiconhandler.(h/cpp)`: display notifications in macOS ## Contribute @@ -81,9 +81,9 @@ the UI layout. Download and install the community edition of [Qt Creator](https://www.qt.io/download/). Uncheck everything except Qt Creator during the installation process. -Instructions for OSX: +Instructions for macOS: -1. Make sure you installed everything through Homebrew mentioned in the [OSX build instructions](/doc/build-osx.md) +1. Make sure you installed everything through Homebrew mentioned in the [macOS build instructions](/doc/build-osx.md) 2. Use `./configure` with the `--enable-debug` flag 3. In Qt Creator do "New Project" -> Import Project -> Import Existing Project 4. Enter "bitcoin-qt" as project name, enter src/qt as location |