Skip to content

Commit b171c69

Browse files
committed
[doc] Update OS X build notes for new qt5 configure
You no longer need to explicitly pass qt5 to configure, as it will now choose qt5 over qt4 if both are installed. [skip-ci]
1 parent eac53ec commit b171c69

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

doc/build-osx.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This guide will show you how to build bitcoind (headless client) for OS X.
55
Notes
66
-----
77

8-
* Tested on OS X 10.7 through 10.10 on 64-bit Intel processors only.
8+
* Tested on OS X 10.7 through 10.11 on 64-bit Intel processors only.
99

1010
* All of the commands should be executed in a Terminal application. The
1111
built-in one is located in `/Applications/Utilities`.
@@ -24,7 +24,7 @@ be re-done or updated every time Xcode is updated.
2424
You will also need to install [Homebrew](http://brew.sh) in order to install library
2525
dependencies.
2626

27-
The installation of the actual dependencies is covered in the Instructions
27+
The installation of the actual dependencies is covered in the instructions
2828
sections below.
2929

3030
Instructions: Homebrew
@@ -36,17 +36,19 @@ Instructions: Homebrew
3636

3737
NOTE: Building with Qt4 is still supported, however, could result in a broken UI. As such, building with Qt5 is recommended.
3838

39-
### Building `bitcoind`
39+
### Building `bitcoin`
4040

4141
1. Clone the GitHub tree to get the source code and go into the directory.
4242

4343
git clone https://github.com/bitcoin/bitcoin.git
4444
cd bitcoin
4545

46-
2. Build bitcoind:
46+
2. Build bitcoin-core:
47+
This will configure and build the headless bitcoin binaries as well as the gui (if Qt is found).
48+
You can disable the gui build by passing `--without-gui` to configure.
4749

4850
./autogen.sh
49-
./configure --with-gui=qt5
51+
./configure
5052
make
5153

5254
3. It is also a good idea to build and run the unit tests:
@@ -60,10 +62,10 @@ NOTE: Building with Qt4 is still supported, however, could result in a broken UI
6062
Use Qt Creator as IDE
6163
------------------------
6264
You can use Qt Creator as IDE, for debugging and for manipulating forms, etc.
63-
Download Qt Creator from http://www.qt.io/download/. Download the "community edition" and only install Qt Creator (uncheck the rest during the installation process).
65+
Download Qt Creator from https://www.qt.io/download/. Download the "community edition" and only install Qt Creator (uncheck the rest during the installation process).
6466

6567
1. Make sure you installed everything through Homebrew mentioned above
66-
2. Do a proper ./configure --with-gui=qt5 --enable-debug
68+
2. Do a proper ./configure --enable-debug
6769
3. In Qt Creator do "New Project" -> Import Project -> Import Existing Project
6870
4. Enter "bitcoin-qt" as project name, enter src/qt as location
6971
5. Leave the file selection as it is
@@ -79,7 +81,7 @@ You can ignore this section if you are building `bitcoind` for your own use.
7981

8082
bitcoind/bitcoin-cli binaries are not included in the Bitcoin-Qt.app bundle.
8183

82-
If you are building `bitcoind` or `Bitcoin-Qt` for others, your build machine should be set up
84+
If you are building `bitcoind` or `Bitcoin Core` for others, your build machine should be set up
8385
as follows for maximum compatibility:
8486

8587
All dependencies should be compiled with these flags:
@@ -88,7 +90,7 @@ All dependencies should be compiled with these flags:
8890
-arch x86_64
8991
-isysroot $(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
9092

91-
Once dependencies are compiled, see [doc/release-process.md](release-process.md) for how the Bitcoin-Qt.app
93+
Once dependencies are compiled, see [doc/release-process.md](release-process.md) for how the Bitcoin Core
9294
bundle is packaged and signed to create the .dmg disk image that is distributed.
9395

9496
Running

0 commit comments

Comments
 (0)