Skip to content

Commit dbacc69

Browse files
committed
build: If both Qt4 and Qt5 are installed, use Qt5
If both Qt4 and Qt5 development headers are installed, use Qt5. Building against Qt5 should be encouraged as that is where active development happens.
1 parent 29c3c43 commit dbacc69

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

build-aux/m4/bitcoin_qt.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ AC_DEFUN([BITCOIN_QT_INIT],[
5050
dnl enable qt support
5151
AC_ARG_WITH([gui],
5252
[AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@],
53-
[build bitcoin-qt GUI (default=auto, qt4 tried first)])],
53+
[build bitcoin-qt GUI (default=auto, qt5 tried first)])],
5454
[
5555
bitcoin_qt_want_version=$withval
5656
if test x$bitcoin_qt_want_version = xyes; then

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ fi
538538
BITCOIN_QT_INIT
539539

540540
dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
541-
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
541+
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5])
542542

543543
if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then
544544
use_boost=no

doc/build-unix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Dependencies for the GUI: Ubuntu & Debian
100100

101101
If you want to build Bitcoin-Qt, make sure that the required packages for Qt development
102102
are installed. Either Qt 5 or Qt 4 are necessary to build the GUI.
103-
If both Qt 4 and Qt 5 are installed, Qt 4 will be used. Pass `--with-gui=qt5` to configure to choose Qt5.
103+
If both Qt 4 and Qt 5 are installed, Qt 5 will be used. Pass `--with-gui=qt4` to configure to choose Qt4.
104104
To build without GUI pass `--without-gui`.
105105

106106
To build with Qt 5 (recommended) you need the following:

0 commit comments

Comments
 (0)