Skip to content

Update submodule to latest and include depends building - #729

Merged
hebasto merged 17 commits into
bitcoin-core:qt6from
johnny9:v31
Jul 12, 2026
Merged

Update submodule to latest and include depends building#729
hebasto merged 17 commits into
bitcoin-core:qt6from
johnny9:v31

Conversation

@johnny9

@johnny9 johnny9 commented May 28, 2026

Copy link
Copy Markdown
Collaborator

Closes #679

@johnny9
johnny9 force-pushed the v31 branch 2 times, most recently from c6c21fb to c61e681 Compare May 28, 2026 21:20

@epicleafies epicleafies left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK c61e681
All tests passing, two minor non-blocking suggestions inline.

Comment thread .github/workflows/artifacts.yml
Comment thread qml/models/walletqmlmodel.cpp Outdated
@johnny9
johnny9 force-pushed the v31 branch 3 times, most recently from 409c9ce to 2f03206 Compare June 30, 2026 20:42
@johnny9 johnny9 changed the title Update submodule to v31 Update submodule to latest and include depends building Jul 7, 2026
@johnny9
johnny9 force-pushed the v31 branch 5 times, most recently from 25e0566 to 1a4f9cc Compare July 9, 2026 11:54

@jarolrod jarolrod left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 1a4f9cc

@hebasto hebasto left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build 1a4f9cc on Fedora 44.

  1. Not a blocker. Multiple -Wtrailing-whitespace= warnings. Something like this should help.

  2. There is a compiling error:

$ cmake --build build -j 1
[2/28] Building CXX object test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o
FAILED: [code=1] test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o 
/usr/lib64/ccache/c++ -DBITCOINQML_NO_TEST_MAIN -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_NO_CXX98_FUNCTION_BASE -DGTEST_LINKED_AS_SHARED_LIBRARY=1 -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_NO_KEYWORDS -DQT_OPENGL_LIB -DQT_QMLINTEGRATION_LIB -DQT_QML_LIB -DQT_QUICKCONTROLS2_LIB -DQT_QUICK_LIB -DQT_TESTCASE_BUILDDIR=\"/home/hebasto/dev/bitcoin-qml/build/test\" -DQT_TESTCASE_SOURCEDIR=\"/home/hebasto/dev/bitcoin-qml/test\" -DQT_TESTLIB_LIB -DQT_USE_QSTRINGBUILDER -DQT_WIDGETS_LIB -I/home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/include -I/home/hebasto/dev/bitcoin-qml/test/.. -I/home/hebasto/dev/bitcoin-qml/test/../bitcoin/src -I/home/hebasto/dev/bitcoin-qml/test/../bitcoin/src/univalue/include -I/home/hebasto/dev/bitcoin-qml/build/test/../bitcoin/src -I/home/hebasto/dev/bitcoin-qml/bitcoin/src/univalue/include -isystem /usr/include/qt6/QtQml -isystem /usr/include/qt6 -isystem /usr/include/qt6/QtCore -isystem /usr/lib64/qt6/mkspecs/linux-g++ -isystem /usr/include/qt6/QtQmlIntegration -isystem /usr/include/qt6/QtNetwork -isystem /usr/include/qt6/QtQuick -isystem /usr/include/qt6/QtGui -isystem /usr/include/qt6/QtOpenGL -isystem /usr/include/qt6/QtQuickControls2 -isystem /usr/include/qt6/QtWidgets -isystem /usr/include/qt6/QtTest -O2 -g -std=c++20 -fno-extended-identifiers -fmacro-prefix-map=/home/hebasto/dev/bitcoin-qml/bitcoin/src=. -fstack-reuse=none -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -Wstack-protector -fstack-protector-all -fcf-protection=full -fstack-clash-protection -Wall -Wextra -Wformat -Wformat-security -Wvla -Wredundant-decls -Wdate-time -Wduplicated-branches -Wduplicated-cond -Wlogical-op -Woverloaded-virtual -Wsuggest-override -Wimplicit-fallthrough -Wunreachable-code -Wbidi-chars=any -Wundef -Wleading-whitespace=spaces -Wtrailing-whitespace=any -Wno-unused-parameter -MD -MT test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o -MF test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o.d -o test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o -c /home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp
In file included from /home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/EWIEGA46WW/moc_gmocktestfixture.cpp:9,
                 from /home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp:2:
/home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/EWIEGA46WW/../../../../test/gmocktestfixture.h:17:10: fatal error: gmock/gmock.h: No such file or directory
   17 | #include <gmock/gmock.h>
      |          ^~~~~~~~~~~~~~~
compilation terminated.
ninja: build stopped: subcommand failed.

johnny9 added 11 commits July 10, 2026 10:22
The updated Core node interface no longer supplies a caption for message box or question callbacks, so derive runtime dialog titles from style and remove the stale caption plumbing from the test bridge.
Avoid treating a late successful init result as node-ready once shutdown has already been requested. This keeps the wallet controller from rebuilding GUI wallet state while Core is shutting down, fixing qml_test_shutdown hangs during load_on_startup shutdown.
johnny9 and others added 4 commits July 10, 2026 10:22
Use NodeClock types from the updated Core node stats interface and adjust the mock Node getProxy override to match the optional-returning API. The starting height field is no longer exposed by node state stats, so report it as unavailable.
Core prefixes OS thread names with "b-" and now asserts the supplied name is at most 13 chars. Keep the wallet worker under that limit.
@johnny9

johnny9 commented Jul 10, 2026

Copy link
Copy Markdown
Collaborator Author

Build 1a4f9cc on Fedora 44.

1. Not a blocker. Multiple `-Wtrailing-whitespace=` warnings. Something like [this](https://github.com/bitcoin/bitcoin/blob/297fd1489bbf9cd9085570d854b4545e6e5f7566/src/qt/CMakeLists.txt#L60-L64) should help.

2. There is a compiling error:
$ cmake --build build -j 1
[2/28] Building CXX object test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o
FAILED: [code=1] test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o 
/usr/lib64/ccache/c++ -DBITCOINQML_NO_TEST_MAIN -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_NO_CXX98_FUNCTION_BASE -DGTEST_LINKED_AS_SHARED_LIBRARY=1 -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_NO_KEYWORDS -DQT_OPENGL_LIB -DQT_QMLINTEGRATION_LIB -DQT_QML_LIB -DQT_QUICKCONTROLS2_LIB -DQT_QUICK_LIB -DQT_TESTCASE_BUILDDIR=\"/home/hebasto/dev/bitcoin-qml/build/test\" -DQT_TESTCASE_SOURCEDIR=\"/home/hebasto/dev/bitcoin-qml/test\" -DQT_TESTLIB_LIB -DQT_USE_QSTRINGBUILDER -DQT_WIDGETS_LIB -I/home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/include -I/home/hebasto/dev/bitcoin-qml/test/.. -I/home/hebasto/dev/bitcoin-qml/test/../bitcoin/src -I/home/hebasto/dev/bitcoin-qml/test/../bitcoin/src/univalue/include -I/home/hebasto/dev/bitcoin-qml/build/test/../bitcoin/src -I/home/hebasto/dev/bitcoin-qml/bitcoin/src/univalue/include -isystem /usr/include/qt6/QtQml -isystem /usr/include/qt6 -isystem /usr/include/qt6/QtCore -isystem /usr/lib64/qt6/mkspecs/linux-g++ -isystem /usr/include/qt6/QtQmlIntegration -isystem /usr/include/qt6/QtNetwork -isystem /usr/include/qt6/QtQuick -isystem /usr/include/qt6/QtGui -isystem /usr/include/qt6/QtOpenGL -isystem /usr/include/qt6/QtQuickControls2 -isystem /usr/include/qt6/QtWidgets -isystem /usr/include/qt6/QtTest -O2 -g -std=c++20 -fno-extended-identifiers -fmacro-prefix-map=/home/hebasto/dev/bitcoin-qml/bitcoin/src=. -fstack-reuse=none -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -Wstack-protector -fstack-protector-all -fcf-protection=full -fstack-clash-protection -Wall -Wextra -Wformat -Wformat-security -Wvla -Wredundant-decls -Wdate-time -Wduplicated-branches -Wduplicated-cond -Wlogical-op -Woverloaded-virtual -Wsuggest-override -Wimplicit-fallthrough -Wunreachable-code -Wbidi-chars=any -Wundef -Wleading-whitespace=spaces -Wtrailing-whitespace=any -Wno-unused-parameter -MD -MT test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o -MF test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o.d -o test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o -c /home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp
In file included from /home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/EWIEGA46WW/moc_gmocktestfixture.cpp:9,
                 from /home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp:2:
/home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/EWIEGA46WW/../../../../test/gmocktestfixture.h:17:10: fatal error: gmock/gmock.h: No such file or directory
   17 | #include <gmock/gmock.h>
      |          ^~~~~~~~~~~~~~~
compilation terminated.
ninja: build stopped: subcommand failed.

Ok, I have applied your suggested change to ignore the whitespace warnings for the qml resources.

I have also modified the default configration to disable app tests by default. We will change this once gmock since it wont work with depends.

@hebasto

hebasto commented Jul 12, 2026

Copy link
Copy Markdown
Member
  1. There is a compiling error:
$ cmake --build build -j 1
[2/28] Building CXX object test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o
FAILED: [code=1] test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o 
/usr/lib64/ccache/c++ -DBITCOINQML_NO_TEST_MAIN -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_NO_CXX98_FUNCTION_BASE -DGTEST_LINKED_AS_SHARED_LIBRARY=1 -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_NO_KEYWORDS -DQT_OPENGL_LIB -DQT_QMLINTEGRATION_LIB -DQT_QML_LIB -DQT_QUICKCONTROLS2_LIB -DQT_QUICK_LIB -DQT_TESTCASE_BUILDDIR=\"/home/hebasto/dev/bitcoin-qml/build/test\" -DQT_TESTCASE_SOURCEDIR=\"/home/hebasto/dev/bitcoin-qml/test\" -DQT_TESTLIB_LIB -DQT_USE_QSTRINGBUILDER -DQT_WIDGETS_LIB -I/home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/include -I/home/hebasto/dev/bitcoin-qml/test/.. -I/home/hebasto/dev/bitcoin-qml/test/../bitcoin/src -I/home/hebasto/dev/bitcoin-qml/test/../bitcoin/src/univalue/include -I/home/hebasto/dev/bitcoin-qml/build/test/../bitcoin/src -I/home/hebasto/dev/bitcoin-qml/bitcoin/src/univalue/include -isystem /usr/include/qt6/QtQml -isystem /usr/include/qt6 -isystem /usr/include/qt6/QtCore -isystem /usr/lib64/qt6/mkspecs/linux-g++ -isystem /usr/include/qt6/QtQmlIntegration -isystem /usr/include/qt6/QtNetwork -isystem /usr/include/qt6/QtQuick -isystem /usr/include/qt6/QtGui -isystem /usr/include/qt6/QtOpenGL -isystem /usr/include/qt6/QtQuickControls2 -isystem /usr/include/qt6/QtWidgets -isystem /usr/include/qt6/QtTest -O2 -g -std=c++20 -fno-extended-identifiers -fmacro-prefix-map=/home/hebasto/dev/bitcoin-qml/bitcoin/src=. -fstack-reuse=none -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -Wstack-protector -fstack-protector-all -fcf-protection=full -fstack-clash-protection -Wall -Wextra -Wformat -Wformat-security -Wvla -Wredundant-decls -Wdate-time -Wduplicated-branches -Wduplicated-cond -Wlogical-op -Woverloaded-virtual -Wsuggest-override -Wimplicit-fallthrough -Wunreachable-code -Wbidi-chars=any -Wundef -Wleading-whitespace=spaces -Wtrailing-whitespace=any -Wno-unused-parameter -MD -MT test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o -MF test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o.d -o test/CMakeFiles/bitcoinqml_unit_tests.dir/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp.o -c /home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp
In file included from /home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/EWIEGA46WW/moc_gmocktestfixture.cpp:9,
                 from /home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/mocs_compilation.cpp:2:
/home/hebasto/dev/bitcoin-qml/build/test/bitcoinqml_unit_tests_autogen/EWIEGA46WW/../../../../test/gmocktestfixture.h:17:10: fatal error: gmock/gmock.h: No such file or directory
   17 | #include <gmock/gmock.h>
      |          ^~~~~~~~~~~~~~~
compilation terminated.
ninja: build stopped: subcommand failed.

https://gitlab.kitware.com/cmake/cmake/-/work_items/27933

@hebasto
hebasto merged commit bcb89ac into bitcoin-core:qt6 Jul 12, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update gui-qml to Bitcoin Core v31

4 participants