Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DRAFT: Custom Datadir Wiring #390

Closed
wants to merge 11 commits into from
Closed

DRAFT: Custom Datadir Wiring #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eea9829
qml: bitcoin.h and cpp, added new class to address setting custom dat…
D33r-Gee Mar 12, 2024
590d0c2
qml: integrated Johny9's Only write options after onboarding #284
johnny9 Mar 12, 2024
1925378
qml: added onboardingmodel files to manage the onboarding process esp…
D33r-Gee Mar 12, 2024
be30a30
qml: StorageLocations.qml, added wiring for custom datadir and reset…
D33r-Gee Mar 12, 2024
a61a3f6
qml: OnboardingCover.qml, commented out the settings code since we a…
D33r-Gee Mar 12, 2024
e9cd5ca
make: added onboardingmodel files to the Make process
D33r-Gee Mar 12, 2024
be62516
qml: updated these files to use onboardingModel instead of optionsMod…
D33r-Gee Mar 12, 2024
6b176c4
qml: fix file location path in Controls plugin for Android
johnny9 Mar 5, 2023
2e3f2b7
qml: statically link QtQuick2Dialog and FolderListModel plugins
johnny9 Mar 16, 2024
555b212
qml: fix AndroidNotifier construction
johnny9 Mar 16, 2024
830ae0b
android: added permissions checks to allow custom datadir read/write
D33r-Gee Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions build-aux/m4/bitcoin_qt.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,12 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
if test -d "$qt_plugin_path/../qml/QtQuick/Controls"; then
QT_LIBS="$QT_LIBS -L$qt_plugin_path/../qml/QtQuick/Controls"
fi
if test -d "$qt_plugin_path/../qml/QtQuick/Dialogs"; then
QT_LIBS="$QT_LIBS -L$qt_plugin_path/../qml/QtQuick/Dialogs -L$qt_plugin_path/../qml/QtQuick/Dialogs/Private"
fi
if test -d "$qt_plugin_path/../qml/Qt/labs/folderlistmodel"; then
QT_LIBS="$QT_LIBS -L$qt_plugin_path/../qml/Qt/labs/folderlistmodel"
fi
if test -d "$qt_plugin_path/../qml/Qt/labs/settings"; then
QT_LIBS="$QT_LIBS -L$qt_plugin_path/../qml/Qt/labs/settings"
fi
Expand Down Expand Up @@ -214,6 +220,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickLayoutsPlugin], [-lqquicklayoutsplugin])
dnl qtquickcontrols module plugins
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls1Plugin], [-lqtquickcontrolsplugin])
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuick2DialogsPlugin], [-ldialogplugin])
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuick2DialogsPrivatePlugin], [-ldialogsprivateplugin])
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QmlFolderListModelPlugin], [-lqmlfolderlistmodelplugin])
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QmlSettingsPlugin], [-lqmlsettingsplugin])
dnl qtquickcontrols2 module plugins
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls2Plugin], [-lqtquickcontrols2plugin])
Expand All @@ -227,6 +236,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickLayoutsPlugin], [-lqml_QtQuick_Layouts_qquicklayoutsplugin])
dnl qtquickcontrols module plugins
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls1Plugin], [-lqml_QtQuick_Controls_qtquickcontrolsplugin])
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuick2DialogsPlugin], [-lqml_QtQuick_Dialogs_dialogplugin])
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuick2DialogsPrivatePlugin], [-lqml_QtQuick_Dialogs_Private_dialogsprivateplugin])
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QmlFolderListModelPlugin], [-lqml_Qt_labs_folderlistmodel_qmlfolderlistmodelplugin])
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QmlSettingsPlugin], [-lqml_Qt_labs_settings_qmlsettingsplugin])
dnl qtquickcontrols2 module plugins
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls2Plugin], [-lqml_QtQuick_Controls_2_qtquickcontrols2plugin])
Expand Down
2 changes: 2 additions & 0 deletions depends/packages/qt.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ $(package)_patches += fast_fixed_dtoa_no_optimize.patch
$(package)_patches += guix_cross_lib_path.patch
$(package)_patches += fix_android_plugin_names.patch
$(package)_patches += fix_riscv_atomic.patch
$(package)_patches += fix_android_controls_file_location.patch

$(package)_qtdeclarative_file_name = qtdeclarative-$($(package)_suffix)
$(package)_qtdeclarative_sha256_hash = 5cc169d91efb15a1ee7f484862f872c3eaba592dacf3c0fbcb55c0f3c208254a
Expand Down Expand Up @@ -300,6 +301,7 @@ define $(package)_preprocess_cmds
patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_android_plugin_names.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_riscv_atomic.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_android_controls_file_location.patch && \
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
Expand Down
13 changes: 13 additions & 0 deletions depends/patches/qt/fix_android_controls_file_location.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/qtquickcontrols/src/controls/plugin.cpp b/src/controls/plugin.cpp
index 446357aa..a08957cd 100644
--- a/qtquickcontrols/src/controls/plugin.cpp
+++ b/qtquickcontrols/src/controls/plugin.cpp
@@ -240,7 +240,7 @@ void QtQuickControls1Plugin::initializeEngine(QQmlEngine *engine, const char *ur
QString QtQuickControls1Plugin::fileLocation() const
{
#ifdef Q_OS_ANDROID
- return "qrc:/android_rcc_bundle/qml/QtQuick/Controls";
+ return "qrc:/qt-project.org/imports/QtQuick/Controls";
#else
# ifndef QT_STATIC
if (isLoadedFromResource())
4 changes: 4 additions & 0 deletions src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ QT_FORMS_UI = \
qt/forms/transactiondescdialog.ui

QT_MOC_CPP = \
qml/moc_bitcoin.cpp \
qml/components/moc_blockclockdial.cpp \
qml/controls/moc_linegraph.cpp \
qml/models/moc_chainmodel.cpp \
qml/models/moc_networktraffictower.cpp \
qml/models/moc_nodemodel.cpp \
qml/models/moc_onboardingmodel.cpp \
qml/models/moc_options_model.cpp \
qml/models/moc_peerlistsortproxy.cpp \
qml/moc_appmode.cpp \
Expand Down Expand Up @@ -119,6 +121,7 @@ BITCOIN_QT_H = \
qml/models/chainmodel.h \
qml/models/networktraffictower.h \
qml/models/nodemodel.h \
qml/models/onboardingmodel.h \
qml/models/options_model.h \
qml/models/peerlistsortproxy.h \
qml/appmode.h \
Expand Down Expand Up @@ -306,6 +309,7 @@ BITCOIN_QML_BASE_CPP = \
qml/models/chainmodel.cpp \
qml/models/networktraffictower.cpp \
qml/models/nodemodel.cpp \
qml/models/onboardingmodel.cpp \
qml/models/options_model.cpp \
qml/models/peerlistsortproxy.cpp \
qml/imageprovider.cpp \
Expand Down
Loading
Loading