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 /configure.ac | |
parent | c702521a85640d1972c982879efcb2cb0f897692 (diff) | |
parent | dbacc69b4f2e16841556a69f26ef9f6b81100100 (diff) |
Merge pull request #6938
dbacc69 build: If both Qt4 and Qt5 are installed, use Qt5 (Wladimir J. van der Laan)
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
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 |