diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-04 16:42:51 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-04 16:43:12 +0100 |
| commit | 193f7b553e0ad41e6579adbce867ef14866034b0 (patch) | |
| tree | fb990b1282002709cb369cbcee6466eec45b1f65 | |
| parent | c702521a85640d1972c982879efcb2cb0f897692 (diff) | |
| parent | dbacc69b4f2e16841556a69f26ef9f6b81100100 (diff) | |
| download | bitcoin-193f7b553e0ad41e6579adbce867ef14866034b0.tar.xz | |
Merge pull request #6938
dbacc69 build: If both Qt4 and Qt5 are installed, use Qt5 (Wladimir J. van der Laan)
| -rw-r--r-- | build-aux/m4/bitcoin_qt.m4 | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/build-unix.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 121e10bd37..4ea2e734e8 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -50,7 +50,7 @@ AC_DEFUN([BITCOIN_QT_INIT],[ dnl enable qt support AC_ARG_WITH([gui], [AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@], - [build bitcoin-qt GUI (default=auto, qt4 tried first)])], + [build bitcoin-qt GUI (default=auto, qt5 tried first)])], [ bitcoin_qt_want_version=$withval if test x$bitcoin_qt_want_version = xyes; then diff --git a/configure.ac b/configure.ac index 1669ec03ce..d94dd0c3dc 100644 --- a/configure.ac +++ b/configure.ac @@ -538,7 +538,7 @@ fi BITCOIN_QT_INIT dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus -BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4]) +BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5]) if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then use_boost=no diff --git a/doc/build-unix.md b/doc/build-unix.md index 25867e2993..2102bbc830 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -100,7 +100,7 @@ Dependencies for the GUI: Ubuntu & Debian If you want to build Bitcoin-Qt, make sure that the required packages for Qt development are installed. Either Qt 5 or Qt 4 are necessary to build the GUI. -If both Qt 4 and Qt 5 are installed, Qt 4 will be used. Pass `--with-gui=qt5` to configure to choose Qt5. +If both Qt 4 and Qt 5 are installed, Qt 5 will be used. Pass `--with-gui=qt4` to configure to choose Qt4. To build without GUI pass `--without-gui`. To build with Qt 5 (recommended) you need the following: |