qmltest: fix build and don't build when static linking

Co-authored-by: Hennadii Stepanov <[email protected]>

Author: 2 people

build-aux/m4/bitcoin_qt.m4

@@ -108,7 +108,7 @@ dnl   BITCOIN_QT_CONFIGURE([MINIMUM-VERSION])
 dnl
 dnl Outputs: See _BITCOIN_QT_FIND_LIBS
 dnl Outputs: Sets variables for all qt-related tools.
-dnl Outputs: bitcoin_enable_qt, bitcoin_enable_qt_dbus, bitcoin_enable_qt_test
+dnl Outputs: bitcoin_enable_qt, bitcoin_enable_qt_dbus, bitcoin_enable_qt_test, bitcoin_enable_qml_test
 AC_DEFUN([BITCOIN_QT_CONFIGURE],[
   qt_version=">= $1"
   qt_lib_prefix="Qt5"
@@ -307,7 +307,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
       bitcoin_enable_qt_test=no
     fi
     bitcoin_enable_qml_test=yes
-    if test "$have_qml_test" = "no"; then
+    if test "$have_quick_test" = "no" || test "$bitcoin_cv_static_qt" = "yes"; then
       bitcoin_enable_qml_test=no
     fi
     bitcoin_enable_qt_dbus=no
@@ -338,6 +338,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
   AC_SUBST(QT_LDFLAGS)
   AC_SUBST(QT_DBUS_INCLUDES)
   AC_SUBST(QT_TEST_INCLUDES)
+  AC_SUBST(QT_QMLTEST_INCLUDES)
   AC_SUBST(QT_SELECT, qt5)
   AC_SUBST(MOC_DEFS)
 ])
@@ -428,7 +429,7 @@ dnl _BITCOIN_QT_FIND_LIBS
 dnl ---------------------
 dnl
 dnl Outputs: All necessary QT_* variables are set.
-dnl Outputs: have_qt_test and have_qt_dbus are set (if applicable) to yes|no.
+dnl Outputs: have_qt_test, have_quick_test, and have_qt_dbus are set (if applicable) to yes|no.
 AC_DEFUN([_BITCOIN_QT_FIND_LIBS],[
   BITCOIN_QT_CHECK([
     PKG_CHECK_MODULES([QT_CORE], [${qt_lib_prefix}Core${qt_lib_suffix} $qt_version], [QT_INCLUDES="$QT_CORE_CFLAGS $QT_INCLUDES" QT_LIBS="$QT_CORE_LIBS $QT_LIBS"],
@@ -472,7 +473,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS],[
                         [BITCOIN_QT_FAIL([${qt_lib_prefix}QuickControls2${qt_lib_suffix} $qt_version not found])])
     ])
     BITCOIN_QT_CHECK([
-      PKG_CHECK_MODULES([QT_QUICKTEST], [${qt_lib_prefix}QuickTest${qt_lib_suffix} $qt_version], [QT_QMLTEST_INCLUDES="$QT_QUICKTEST_CFLAGS"; have_quick_test=yes],[have_quick_test=no])
+      PKG_CHECK_MODULES([QT_QUICKTEST], [${qt_lib_prefix}QuickTest${qt_lib_suffix} $qt_version], [QT_QMLTEST_INCLUDES="$QT_QUICKTEST_CFLAGS"; have_quick_test=yes], [have_quick_test=no])
     ])
 
     AC_DEFINE([USE_QML], [1], [Define to 1 to use QML-based GUI])

ci/test/00_setup_env_mac_native_arm64.sh

@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
 export HOST=arm64-apple-darwin
 export PIP_PACKAGES="zmq"
 export GOAL="install"
-export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports"
+export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports CXXFLAGS=-Wno-shadow-field"
 export CI_OS_NAME="macos"
 export NO_DEPENDS=1
 export OSX_SDK=""

configure.ac

@@ -1318,6 +1318,7 @@ if test "$enable_fuzz" = "yes"; then
   build_bitcoin_libs=no
   bitcoin_enable_qt=no
   bitcoin_enable_qt_test=no
+  bitcoin_enable_qml_test=no
   bitcoin_enable_qt_dbus=no
   use_bench=no
   use_tests=no
@@ -1331,7 +1332,7 @@ if test "$enable_fuzz" = "yes"; then
 else
   BITCOIN_QT_INIT
 
-  dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
+  dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qml_test, $bitcoin_enable_qt_dbus
   BITCOIN_QT_CONFIGURE([5.11.3])
 
   dnl Keep a copy of the original $QT_INCLUDES and use it when invoking qt's moc

src/Makefile.qmltest.include

@@ -10,27 +10,27 @@ TEST_QML_MOC_CPP = qml/test/moc_setup.cpp
 TEST_QML_H = qml/test/setup.h qml/test/testimageprovider.h
 
 qml_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) \
-  $(QT_INCLUDES) $(QT_QUICKTEST_INCLUDES) $(BOOST_CPPFLAGS) $(QT_QUICKTEST_CFLAGS)
+  $(QT_INCLUDES) $(QT_QMLTEST_INCLUDES) $(BOOST_CPPFLAGS)
 
 qml_test_test_bitcoin_qt_SOURCES = \
-  qml/test/setup.cpp \
   qml/bitcoin_qml.qrc \
+  qml/test/setup.cpp \
   qml/test/testimageprovider.cpp \
   $(TEST_QML_H)
 
 nodist_qml_test_test_bitcoin_qt_SOURCES = $(TEST_QML_MOC_CPP) $(QML_QRC_CPP)
 
-qml_test_test_bitcoin_qt_LDADD = $(QT_QUICKTEST_LIBS) $(QT_LIBS)
+qml_test_test_bitcoin_qt_LDADD = $(QT_LIBS) $(QT_QUICKTEST_LIBS)
 qml_test_test_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
 qml_test_test_bitcoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 
 CLEAN_BITCOIN_QML_TEST = $(TEST_QML_MOC_CPP)
 
 CLEANFILES += $(CLEAN_BITCOIN_QML_TEST)
 
-test_bitcoin_qt_qml : qml/test/test_bitcoin-qt-qml$(EXEEXT)
+test_bitcoin_qt_qml: qml/test/test_bitcoin-qt$(EXEEXT)
 
-test_bitcoin_qt_qml_check : qt/test/test_bitcoin-qt-qml$(EXEEXT) FORCE
+test_bitcoin_qt_qml_check: qml/test/test_bitcoin-qt$(EXEEXT) FORCE
 	$(MAKE) check-TESTS TESTS=$^
 
 test_bitcoin_qt_qml_clean: FORCE

src/qml/test/setup.cpp

@@ -1,9 +1,16 @@
 // Copyright (c) 2023 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include <qml/test/setup.h>
 
+#if defined(HAVE_CONFIG_H)
+#include <config/bitcoin-config.h>
+#endif
+
 #include <QtQuickTest>
+#include <QtTest>
+#include <QtTest/qtestcase.h>
 #include <QQmlEngine>
 #include <QQmlContext>
 #include <qml/test/testimageprovider.h>