diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-04-08 20:01:08 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-04-08 20:01:08 -0500 |
| commit | 691fdac7a4cd6ec56ab97d7d0d5caf3875bacf55 (patch) | |
| tree | 26232d70e00bad0e7e122b64ceda5f3f2a7f9030 | |
| parent | 183585653f70e6ca66a043c42fdd825f1899c1c4 (diff) | |
| parent | 76b0b6013a71de58b7cbdab7b562375458590c33 (diff) | |
| download | monzero-gui-691fdac7a4cd6ec56ab97d7d0d5caf3875bacf55.tar.gz monzero-gui-691fdac7a4cd6ec56ab97d7d0d5caf3875bacf55.tar.xz monzero-gui-691fdac7a4cd6ec56ab97d7d0d5caf3875bacf55.zip | |
Merge pull request #3379
76b0b60 docker: build with QtQmlModels plugin (xiphon)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/main/main.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 267e1d76..0c354837 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -303,6 +303,7 @@ if(STATIC) list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtGraphicalEffects/private) list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtMultimedia) list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQml) + list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQml/Models.2) list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick.2) list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Controls) list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Controls.2) @@ -325,6 +326,7 @@ if(STATIC) qmlsettingsplugin qmlxmllistmodelplugin qquicklayoutsplugin + modelsplugin ) if(WITH_SCANNER) diff --git a/src/main/main.cpp b/src/main/main.cpp index b4e1fe42..10cf5a73 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -123,6 +123,7 @@ Q_IMPORT_PLUGIN(QGenericEnginePlugin) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) Q_IMPORT_PLUGIN(QtQmlPlugin) #endif +Q_IMPORT_PLUGIN(QtQmlModelsPlugin) Q_IMPORT_PLUGIN(QtQuick2Plugin) Q_IMPORT_PLUGIN(QtQuickLayoutsPlugin) Q_IMPORT_PLUGIN(QtGraphicalEffectsPlugin) |