doc: Build with qt5 is possible again #3564

pull laanwj wants to merge 1 commits into bitcoin:master from laanwj:2014_01_doc_update changing 1 files +7 −1

laanwj commented at 8:12 AM on January 21, 2014: member

This reverts commit 62568f9a1e98065bd51069649f23a337eab89f94. Also add some documentation for --with-gui.

doc: Build with qt5 is possible again

This reverts commit 62568f9a1e98065bd51069649f23a337eab89f94.
Also add some documentation for `--with-gui`.

54d2b91cab

in doc/build-unix.md:None in 78c2b1d435 outdated

  86 | @@ -87,12 +87,18 @@ Dependencies for the GUI: Ubuntu & Debian
  87 |  -----------------------------------------
  88 |  
  89 |  If you want to build Bitcoin-Qt, make sure that the required packages for Qt development
  90 | -are installed. Qt 4 is currently necessary to build the GUI.
  91 | +are installed. Either Qt 4 or Qt 5 is necessary to build the GUI.

fanquake commented at 8:16 AM on January 21, 2014:

nit: "are necessary"

in doc/build-unix.md:None in 78c2b1d435 outdated

  86 | @@ -87,12 +87,18 @@ Dependencies for the GUI: Ubuntu & Debian
  87 |  -----------------------------------------
  88 |  
  89 |  If you want to build Bitcoin-Qt, make sure that the required packages for Qt development
  90 | -are installed. Qt 4 is currently necessary to build the GUI.
  91 | +are installed. Either Qt 4 or Qt 5 is necessary to build the GUI.
  92 | +If both Qt 4 and Qt 5 is installed, Qt 4 will be used. Pass `--with-gui=qt5` to configure to choose Qt5.

fanquake commented at 8:16 AM on January 21, 2014:

nit: "are installed"

BitcoinPullTester commented at 2:05 PM on January 21, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/54d2b91cab0c40579bfaabb4ff66348642dbc88b for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
laanwj commented at 2:21 PM on January 21, 2014: member

Ok, fixed the nits, merging
laanwj referenced this in commit 250b4bcf6b on Jan 21, 2014
laanwj merged this on Jan 21, 2014
laanwj closed this on Jan 21, 2014
laanwj deleted the branch on Apr 9, 2014
DrahtBot locked this on Sep 8, 2021

Contributors

laanwj

fanquake

BitcoinPullTester