diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 2d56708716..2637b0afb5 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -166,6 +166,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ if test -d "$qt_plugin_path/../qml/Qt/labs/settings"; then QT_LIBS="$QT_LIBS -L$qt_plugin_path/../qml/Qt/labs/settings" 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 dnl qtquickcontrols2 module paths if test -d "$qt_plugin_path/../qml/QtQuick/Controls.2"; then @@ -215,6 +218,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ dnl qtquickcontrols module plugins _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls1Plugin], [-lqtquickcontrolsplugin]) _BITCOIN_QT_CHECK_STATIC_PLUGIN([QmlSettingsPlugin], [-lqmlsettingsplugin]) + _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuick2DialogsPlugin], [-ldialogplugin]) + _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuick2DialogsPrivatePlugin], [-ldialogsprivateplugin]) + _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls1Plugin], [-lqtquickcontrolsplugin]) dnl qtquickcontrols2 module plugins _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls2Plugin], [-lqtquickcontrols2plugin]) _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickTemplates2Plugin], [-lqtquicktemplates2plugin]) @@ -228,6 +234,8 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ dnl qtquickcontrols module plugins _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls1Plugin], [-lqml_QtQuick_Controls_qtquickcontrolsplugin]) _BITCOIN_QT_CHECK_STATIC_PLUGIN([QmlSettingsPlugin], [-lqml_Qt_labs_settings_qmlsettingsplugin]) + _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuick2DialogsPlugin], [-lqml_QtQuick_Dialogs_dialogplugin]) + _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls1Plugin], [-lqml_QtQuick_Controls_qtquickcontrolsplugin]) dnl qtquickcontrols2 module plugins _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickControls2Plugin], [-lqml_QtQuick_Controls_2_qtquickcontrols2plugin]) _BITCOIN_QT_CHECK_STATIC_PLUGIN([QtQuickTemplates2Plugin], [-lqml_QtQuick_Templates_2_qtquicktemplates2plugin]) diff --git a/src/qml/README.md b/src/qml/README.md index cd2f7d2e71..ccc0a5871b 100644 --- a/src/qml/README.md +++ b/src/qml/README.md @@ -74,7 +74,7 @@ The following runtime dependencies are also required for dynamic builds; they are not needed for static builds: ``` -sudo apt install qml-module-qtquick2 qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtquick-window2 qml-module-qt-labs-settings +sudo apt install qml-module-qtquick2 qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-layouts qml-module-qtquick-window2 qml-module-qt-labs-settings ``` #### Fedora: diff --git a/src/qml/bitcoin.cpp b/src/qml/bitcoin.cpp index 10e8a959d0..550284c7ca 100644 --- a/src/qml/bitcoin.cpp +++ b/src/qml/bitcoin.cpp @@ -57,6 +57,10 @@ QT_END_NAMESPACE #include Q_IMPORT_PLUGIN(QtQmlPlugin) Q_IMPORT_PLUGIN(QtQmlModelsPlugin) +Q_IMPORT_PLUGIN(QtQuick2DialogsPlugin) +#ifndef QT_QPA_PLATFORM_ANDROID +Q_IMPORT_PLUGIN(QtQuick2DialogsPrivatePlugin) +#endif Q_IMPORT_PLUGIN(QtQuick2Plugin) Q_IMPORT_PLUGIN(QtQuick2WindowPlugin) Q_IMPORT_PLUGIN(QtQuickControls1Plugin)