qml: add QtQuickTest library to qmltest target

Author: Johnny Carlson

build-aux/m4/bitcoin_qt.m4

@@ -467,6 +467,11 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS],[
       PKG_CHECK_MODULES([QT_QUICKCONTROLS], [${qt_lib_prefix}QuickControls2${qt_lib_suffix} $qt_version], [QT_INCLUDES="$QT_QUICKCONTROLS_CFLAGS $QT_INCLUDES" QT_LIBS="$QT_QUICKCONTROLS_LIBS $QT_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_INCLUDES="$QT_QUICKTEST_CFLAGS $QT_INCLUDES" QT_LIBS="$QT_QUICKTEST_LIBS $QT_LIBS"],
+                        [BITCOIN_QT_FAIL([${qt_lib_prefix}QuickTest${qt_lib_suffix} $qt_version not found])])
+    ])
+
     AC_DEFINE([USE_QML], [1], [Define to 1 to use QML-based GUI])
   fi
 ])

src/Makefile.am

@@ -1104,6 +1104,7 @@ endif
 
 if ENABLE_QT
 include Makefile.qt.include
+include Makefile.qmltest.include
 endif
 
 if ENABLE_QT_TESTS

src/Makefile.qmltest.include

@@ -5,32 +5,20 @@
 bin_PROGRAMS += qml/test/test_bitcoin-qt
 TESTS += qml/test/test_bitcoin-qt
 
-TEST_QML_MOC_CPP = \
-  qml/test/moc_onboardingtests.cpp
+TEST_QML_MOC_CPP =
 
 TEST_QML_H = 
 
 qml_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
   $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(BOOST_CPPFLAGS)
 
 qml_test_test_bitcoin_qt_SOURCES = \
-  init/bitcoin-qt.cpp \
   qml/test/onboardingtests.cpp \
   $(TEST_QML_H)
 
 nodist_qml_test_test_bitcoin_qt_SOURCES = $(TEST_QML_MOC_CPP)
 
-qml_test_test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_NODE) $(LIBTEST_UTIL)
-if ENABLE_WALLET
-qml_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET)
-endif
-if ENABLE_ZMQ
-qml_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
-endif
-qml_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \
-  $(LIBMEMENV) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
-  $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(LIBSECP256K1) \
-  $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(SQLITE_LIBS)
+qml_test_test_bitcoin_qt_LDADD = $(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)