Skip to content

Commit bad068a

Browse files
laanwjlaanwj
committed
build: Build system changes to support only Qt5
1 parent 8eb76f3 commit bad068a

File tree

2 files changed

+91
-149
lines changed

2 files changed

+91
-149
lines changed

‎build-aux/m4/bitcoin_qt.m4‎

Lines changed: 90 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ dnl CAUTION: Do not use this inside of a conditional.
5353
AC_DEFUN([BITCOIN_QT_INIT],[
5454
dnl enable qt support
5555
AC_ARG_WITH([gui],
56-
[AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@],
57-
[build bitcoin-qt GUI (default=auto, qt5 tried first)])],
56+
[AS_HELP_STRING([--with-gui@<:@=no|qt5|auto@:>@],
57+
[build bitcoin-qt GUI (default=auto)])],
5858
[
5959
bitcoin_qt_want_version=$withval
6060
if test "x$bitcoin_qt_want_version" = xyes; then
@@ -94,82 +94,66 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
9494
fi
9595
9696
if test "x$use_pkgconfig" = xyes; then
97-
BITCOIN_QT_CHECK([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG([$2])])
97+
BITCOIN_QT_CHECK([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG])
9898
else
9999
BITCOIN_QT_CHECK([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG])
100100
fi
101101
102102
dnl This is ugly and complicated. Yuck. Works as follows:
103-
dnl We can't discern whether Qt4 builds are static or not. For Qt5, we can
104-
dnl check a header to find out. When Qt is built statically, some plugins must
105-
dnl be linked into the final binary as well. These plugins have changed between
106-
dnl Qt4 and Qt5. With Qt5, languages moved into core and the WindowsIntegration
107-
dnl plugin was added. Since we can't tell if Qt4 is static or not, it is
108-
dnl assumed for windows builds.
103+
dnl For Qt5, we can check a header to find out whether Qt is build
104+
dnl statically. When Qt is built statically, some plugins must be linked into
105+
dnl the final binary as well.
106+
dnl With Qt5, languages moved into core and the WindowsIntegration plugin was
107+
dnl added.
109108
dnl _BITCOIN_QT_CHECK_STATIC_PLUGINS does a quick link-check and appends the
110109
dnl results to QT_LIBS.
111110
BITCOIN_QT_CHECK([
112111
TEMP_CPPFLAGS=$CPPFLAGS
113112
TEMP_CXXFLAGS=$CXXFLAGS
114113
CPPFLAGS="$QT_INCLUDES $CPPFLAGS"
115114
CXXFLAGS="$PIC_FLAGS $CXXFLAGS"
116-
if test "x$bitcoin_qt_got_major_vers" = x5; then
117-
_BITCOIN_QT_IS_STATIC
118-
if test "x$bitcoin_cv_static_qt" = xyes; then
119-
_BITCOIN_QT_FIND_STATIC_PLUGINS
120-
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static])
121-
AC_CACHE_CHECK(for Qt < 5.4, bitcoin_cv_need_acc_widget,[
122-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
123-
#include <QtCore/qconfig.h>
124-
#ifndef QT_VERSION
125-
# include <QtCore/qglobal.h>
126-
#endif
127-
]],
128-
[[
129-
#if QT_VERSION >= 0x050400
130-
choke
131-
#endif
132-
]])],
133-
[bitcoin_cv_need_acc_widget=yes],
134-
[bitcoin_cv_need_acc_widget=no])
135-
])
136-
if test "x$bitcoin_cv_need_acc_widget" = xyes; then
137-
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets])
138-
fi
139-
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin)],[-lqminimal])
140-
AC_DEFINE(QT_QPA_PLATFORM_MINIMAL, 1, [Define this symbol if the minimal qt platform exists])
141-
if test "x$TARGET_OS" = xwindows; then
142-
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)],[-lqwindows])
143-
AC_DEFINE(QT_QPA_PLATFORM_WINDOWS, 1, [Define this symbol if the qt platform is windows])
144-
elif test "x$TARGET_OS" = xlinux; then
145-
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)],[-lqxcb -lxcb-static])
146-
AC_DEFINE(QT_QPA_PLATFORM_XCB, 1, [Define this symbol if the qt platform is xcb])
147-
elif test "x$TARGET_OS" = xdarwin; then
148-
AX_CHECK_LINK_FLAG([[-framework IOKit]],[QT_LIBS="$QT_LIBS -framework IOKit"],[AC_MSG_ERROR(could not iokit framework)])
149-
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)],[-lqcocoa])
150-
AC_DEFINE(QT_QPA_PLATFORM_COCOA, 1, [Define this symbol if the qt platform is cocoa])
151-
fi
115+
_BITCOIN_QT_IS_STATIC
116+
if test "x$bitcoin_cv_static_qt" = xyes; then
117+
_BITCOIN_QT_FIND_STATIC_PLUGINS
118+
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static])
119+
AC_CACHE_CHECK(for Qt < 5.4, bitcoin_cv_need_acc_widget,[
120+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
121+
#include <QtCore/qconfig.h>
122+
#ifndef QT_VERSION
123+
# include <QtCore/qglobal.h>
124+
#endif
125+
]],
126+
[[
127+
#if QT_VERSION >= 0x050400
128+
choke
129+
#endif
130+
]])],
131+
[bitcoin_cv_need_acc_widget=yes],
132+
[bitcoin_cv_need_acc_widget=no])
133+
])
134+
if test "x$bitcoin_cv_need_acc_widget" = xyes; then
135+
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets])
152136
fi
153-
else
137+
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin)],[-lqminimal])
138+
AC_DEFINE(QT_QPA_PLATFORM_MINIMAL, 1, [Define this symbol if the minimal qt platform exists])
154139
if test "x$TARGET_OS" = xwindows; then
155-
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static])
156-
_BITCOIN_QT_CHECK_STATIC_PLUGINS([
157-
Q_IMPORT_PLUGIN(qcncodecs)
158-
Q_IMPORT_PLUGIN(qjpcodecs)
159-
Q_IMPORT_PLUGIN(qtwcodecs)
160-
Q_IMPORT_PLUGIN(qkrcodecs)
161-
Q_IMPORT_PLUGIN(AccessibleFactory)],
162-
[-lqcncodecs -lqjpcodecs -lqtwcodecs -lqkrcodecs -lqtaccessiblewidgets])
140+
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)],[-lqwindows])
141+
AC_DEFINE(QT_QPA_PLATFORM_WINDOWS, 1, [Define this symbol if the qt platform is windows])
142+
elif test "x$TARGET_OS" = xlinux; then
143+
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)],[-lqxcb -lxcb-static])
144+
AC_DEFINE(QT_QPA_PLATFORM_XCB, 1, [Define this symbol if the qt platform is xcb])
145+
elif test "x$TARGET_OS" = xdarwin; then
146+
AX_CHECK_LINK_FLAG([[-framework IOKit]],[QT_LIBS="$QT_LIBS -framework IOKit"],[AC_MSG_ERROR(could not iokit framework)])
147+
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)],[-lqcocoa])
148+
AC_DEFINE(QT_QPA_PLATFORM_COCOA, 1, [Define this symbol if the qt platform is cocoa])
163149
fi
164150
fi
165151
CPPFLAGS=$TEMP_CPPFLAGS
166152
CXXFLAGS=$TEMP_CXXFLAGS
167153
])
168154
169155
if test "x$use_pkgconfig$qt_bin_path" = xyes; then
170-
if test "x$bitcoin_qt_got_major_vers" = x5; then
171-
qt_bin_path="`$PKG_CONFIG --variable=host_bins Qt5Core 2>/dev/null`"
172-
fi
156+
qt_bin_path="`$PKG_CONFIG --variable=host_bins Qt5Core 2>/dev/null`"
173157
fi
174158
175159
if test "x$use_hardening" != xno; then
@@ -219,11 +203,11 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
219203
])
220204
fi
221205
222-
BITCOIN_QT_PATH_PROGS([MOC], [moc-qt${bitcoin_qt_got_major_vers} moc${bitcoin_qt_got_major_vers} moc], $qt_bin_path)
223-
BITCOIN_QT_PATH_PROGS([UIC], [uic-qt${bitcoin_qt_got_major_vers} uic${bitcoin_qt_got_major_vers} uic], $qt_bin_path)
224-
BITCOIN_QT_PATH_PROGS([RCC], [rcc-qt${bitcoin_qt_got_major_vers} rcc${bitcoin_qt_got_major_vers} rcc], $qt_bin_path)
225-
BITCOIN_QT_PATH_PROGS([LRELEASE], [lrelease-qt${bitcoin_qt_got_major_vers} lrelease${bitcoin_qt_got_major_vers} lrelease], $qt_bin_path)
226-
BITCOIN_QT_PATH_PROGS([LUPDATE], [lupdate-qt${bitcoin_qt_got_major_vers} lupdate${bitcoin_qt_got_major_vers} lupdate],$qt_bin_path, yes)
206+
BITCOIN_QT_PATH_PROGS([MOC], [moc-qt5 moc5 moc], $qt_bin_path)
207+
BITCOIN_QT_PATH_PROGS([UIC], [uic-qt5 uic5 uic], $qt_bin_path)
208+
BITCOIN_QT_PATH_PROGS([RCC], [rcc-qt5 rcc5 rcc], $qt_bin_path)
209+
BITCOIN_QT_PATH_PROGS([LRELEASE], [lrelease-qt5 lrelease5 lrelease], $qt_bin_path)
210+
BITCOIN_QT_PATH_PROGS([LUPDATE], [lupdate-qt5 lupdate5 lupdate],$qt_bin_path, yes)
227211
228212
MOC_DEFS='-DHAVE_CONFIG_H -I$(srcdir)'
229213
case $host in
@@ -262,7 +246,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
262246
],[
263247
bitcoin_enable_qt=no
264248
])
265-
AC_MSG_RESULT([$bitcoin_enable_qt (Qt${bitcoin_qt_got_major_vers})])
249+
AC_MSG_RESULT([$bitcoin_enable_qt (Qt5)])
266250
267251
AC_SUBST(QT_PIE_FLAGS)
268252
AC_SUBST(QT_INCLUDES)
@@ -272,7 +256,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
272256
AC_SUBST(QT_DBUS_LIBS)
273257
AC_SUBST(QT_TEST_INCLUDES)
274258
AC_SUBST(QT_TEST_LIBS)
275-
AC_SUBST(QT_SELECT, qt${bitcoin_qt_got_major_vers})
259+
AC_SUBST(QT_SELECT, qt5)
276260
AC_SUBST(MOC_DEFS)
277261
])
278262
@@ -301,7 +285,7 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[
301285
])])
302286
303287
dnl Internal. Check if the linked version of Qt was built as static libs.
304-
dnl Requires: Qt5. This check cannot determine if Qt4 is static.
288+
dnl Requires: Qt5.
305289
dnl Requires: INCLUDES and LIBS must be populated as necessary.
306290
dnl Output: bitcoin_cv_static_qt=yes|no
307291
dnl Output: Defines QT_STATICPLUGIN if plugins are static.
@@ -346,58 +330,50 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[
346330
])
347331
348332
dnl Internal. Find paths necessary for linking qt static plugins
349-
dnl Inputs: bitcoin_qt_got_major_vers. 4 or 5.
350333
dnl Inputs: qt_plugin_path. optional.
351334
dnl Outputs: QT_LIBS is appended
352335
AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
353-
if test "x$bitcoin_qt_got_major_vers" = x5; then
354-
if test "x$qt_plugin_path" != x; then
355-
QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms"
356-
if test -d "$qt_plugin_path/accessible"; then
357-
QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible"
358-
fi
336+
if test "x$qt_plugin_path" != x; then
337+
QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms"
338+
if test -d "$qt_plugin_path/accessible"; then
339+
QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible"
359340
fi
360-
if test "x$use_pkgconfig" = xyes; then
361-
: dnl
362-
m4_ifdef([PKG_CHECK_MODULES],[
363-
PKG_CHECK_MODULES([QTPLATFORM], [Qt5PlatformSupport], [QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"])
364-
if test "x$TARGET_OS" = xlinux; then
365-
PKG_CHECK_MODULES([X11XCB], [x11-xcb], [QT_LIBS="$X11XCB_LIBS $QT_LIBS"])
366-
if ${PKG_CONFIG} --exists "Qt5Core >= 5.5" 2>/dev/null; then
367-
PKG_CHECK_MODULES([QTXCBQPA], [Qt5XcbQpa], [QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"])
368-
fi
369-
elif test "x$TARGET_OS" = xdarwin; then
370-
PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
341+
fi
342+
if test "x$use_pkgconfig" = xyes; then
343+
: dnl
344+
m4_ifdef([PKG_CHECK_MODULES],[
345+
PKG_CHECK_MODULES([QTPLATFORM], [Qt5PlatformSupport], [QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"])
346+
if test "x$TARGET_OS" = xlinux; then
347+
PKG_CHECK_MODULES([X11XCB], [x11-xcb], [QT_LIBS="$X11XCB_LIBS $QT_LIBS"])
348+
if ${PKG_CONFIG} --exists "Qt5Core >= 5.5" 2>/dev/null; then
349+
PKG_CHECK_MODULES([QTXCBQPA], [Qt5XcbQpa], [QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"])
371350
fi
372-
])
373-
else
374-
if test "x$TARGET_OS" = xwindows; then
375-
AC_CACHE_CHECK(for Qt >= 5.6, bitcoin_cv_need_platformsupport,[
376-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
377-
#include <QtCore/qconfig.h>
378-
#ifndef QT_VERSION
379-
# include <QtCore/qglobal.h>
380-
#endif
381-
]],
382-
[[
383-
#if QT_VERSION < 0x050600
384-
choke
385-
#endif
386-
]])],
387-
[bitcoin_cv_need_platformsupport=yes],
388-
[bitcoin_cv_need_platformsupport=no])
389-
])
390-
if test "x$bitcoin_cv_need_platformsupport" = xyes; then
391-
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}PlatformSupport not found)))
392-
fi
351+
elif test "x$TARGET_OS" = xdarwin; then
352+
PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
353+
fi
354+
])
355+
else
356+
if test "x$TARGET_OS" = xwindows; then
357+
AC_CACHE_CHECK(for Qt >= 5.6, bitcoin_cv_need_platformsupport,[
358+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
359+
#include <QtCore/qconfig.h>
360+
#ifndef QT_VERSION
361+
# include <QtCore/qglobal.h>
362+
#endif
363+
]],
364+
[[
365+
#if QT_VERSION < 0x050600
366+
choke
367+
#endif
368+
]])],
369+
[bitcoin_cv_need_platformsupport=yes],
370+
[bitcoin_cv_need_platformsupport=no])
371+
])
372+
if test "x$bitcoin_cv_need_platformsupport" = xyes; then
373+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}PlatformSupport not found)))
393374
fi
394375
fi
395-
else
396-
if test "x$qt_plugin_path" != x; then
397-
QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible"
398-
QT_LIBS="$QT_LIBS -L$qt_plugin_path/codecs"
399-
fi
400-
fi
376+
fi
401377
])
402378
403379
dnl Internal. Find Qt libraries using pkg-config.
@@ -406,38 +382,14 @@ dnl first.
406382
dnl Inputs: $1: If bitcoin_qt_want_version is "auto", check for this version
407383
dnl first.
408384
dnl Outputs: All necessary QT_* variables are set.
409-
dnl Outputs: bitcoin_qt_got_major_vers is set to "4" or "5".
410385
dnl Outputs: have_qt_test and have_qt_dbus are set (if applicable) to yes|no.
411386
AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG],[
412387
m4_ifdef([PKG_CHECK_MODULES],[
413-
auto_priority_version=$1
414-
if test "x$auto_priority_version" = x; then
415-
auto_priority_version=qt5
416-
fi
417-
if test "x$bitcoin_qt_want_version" = xqt5 || ( test "x$bitcoin_qt_want_version" = xauto && test "x$auto_priority_version" = xqt5 ); then
418-
QT_LIB_PREFIX=Qt5
419-
bitcoin_qt_got_major_vers=5
420-
else
421-
QT_LIB_PREFIX=Qt
422-
bitcoin_qt_got_major_vers=4
423-
fi
388+
QT_LIB_PREFIX=Qt5
424389
qt5_modules="Qt5Core Qt5Gui Qt5Network Qt5Widgets"
425-
qt4_modules="QtCore QtGui QtNetwork"
426390
BITCOIN_QT_CHECK([
427-
if test "x$bitcoin_qt_want_version" = xqt5 || ( test "x$bitcoin_qt_want_version" = xauto && test "x$auto_priority_version" = xqt5 ); then
428-
PKG_CHECK_MODULES([QT5], [$qt5_modules], [QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" have_qt=yes],[have_qt=no])
429-
elif test "x$bitcoin_qt_want_version" = xqt4 || ( test "x$bitcoin_qt_want_version" = xauto && test "x$auto_priority_version" = xqt4 ); then
430-
PKG_CHECK_MODULES([QT4], [$qt4_modules], [QT_INCLUDES="$QT4_CFLAGS"; QT_LIBS="$QT4_LIBS" ; have_qt=yes], [have_qt=no])
431-
fi
391+
PKG_CHECK_MODULES([QT5], [$qt5_modules], [QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" have_qt=yes],[have_qt=no])
432392
433-
dnl qt version is set to 'auto' and the preferred version wasn't found. Now try the other.
434-
if test "x$have_qt" = xno && test "x$bitcoin_qt_want_version" = xauto; then
435-
if test "x$auto_priority_version" = xqt5; then
436-
PKG_CHECK_MODULES([QT4], [$qt4_modules], [QT_INCLUDES="$QT4_CFLAGS"; QT_LIBS="$QT4_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt; bitcoin_qt_got_major_vers=4], [have_qt=no])
437-
else
438-
PKG_CHECK_MODULES([QT5], [$qt5_modules], [QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt5; bitcoin_qt_got_major_vers=5], [have_qt=no])
439-
fi
440-
fi
441393
if test "x$have_qt" != xyes; then
442394
have_qt=no
443395
BITCOIN_QT_FAIL([Qt dependencies not found])
@@ -458,7 +410,6 @@ dnl from the discovered headers.
458410
dnl Inputs: bitcoin_qt_want_version (from --with-gui=). The version to use.
459411
dnl If "auto", the version will be discovered by _BITCOIN_QT_CHECK_QT5.
460412
dnl Outputs: All necessary QT_* variables are set.
461-
dnl Outputs: bitcoin_qt_got_major_vers is set to "4" or "5".
462413
dnl Outputs: have_qt_test and have_qt_dbus are set (if applicable) to yes|no.
463414
AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
464415
TEMP_CPPFLAGS="$CPPFLAGS"
@@ -480,13 +431,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
480431
if test "x$bitcoin_qt_want_version" = xauto; then
481432
_BITCOIN_QT_CHECK_QT5
482433
fi
483-
if test "x$bitcoin_cv_qt5" = xyes || test "x$bitcoin_qt_want_version" = xqt5; then
484-
QT_LIB_PREFIX=Qt5
485-
bitcoin_qt_got_major_vers=5
486-
else
487-
QT_LIB_PREFIX=Qt
488-
bitcoin_qt_got_major_vers=4
489-
fi
434+
QT_LIB_PREFIX=Qt5
490435
])
491436
492437
BITCOIN_QT_CHECK([
@@ -508,9 +453,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
508453
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Core not found)))
509454
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Gui not found)))
510455
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Network not found)))
511-
if test "x$bitcoin_qt_got_major_vers" = x5; then
512-
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Widgets],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Widgets not found)))
513-
fi
456+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Widgets],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Widgets not found)))
514457
QT_LIBS="$LIBS"
515458
LIBS="$TEMP_LIBS"
516459

‎configure.ac‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ fi
837837
BITCOIN_QT_INIT
838838

839839
dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
840-
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5])
840+
BITCOIN_QT_CONFIGURE([$use_pkgconfig])
841841

842842
if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononono; then
843843
use_boost=no
@@ -1422,7 +1422,6 @@ echo "Options used to compile and link:"
14221422
echo " with wallet = $enable_wallet"
14231423
echo " with gui / qt = $bitcoin_enable_qt"
14241424
if test x$bitcoin_enable_qt != xno; then
1425-
echo " qt version = $bitcoin_qt_got_major_vers"
14261425
echo " with qr = $use_qr"
14271426
fi
14281427
echo " with zmq = $use_zmq"

0 commit comments

Comments
 (0)