Skip to content

Commit 81e88a8

Browse files
erikjvthesamesamDeepDiver1975
authored
fix: compatibility with extra-cmake-modules-6.19.0 (#12374) (#12450)
Fix compatibility with extra-cmake-modules-6.19.0 owncloud is not using a custom QQmlExtensionPlugin subclass, so we need to pass GENERATE_PLUGIN_SOURCE so that a default implementation is generated. This fixes compatibility with ECM 6.19 since that (correctly) considers plugins that don't use GENERATE_PLUGIN_SOURCE to be not optional [0]. That causes the QML engine to try and load the (invalid) plugin: ``` QList(qrc:/qt/qml/org/ownCloud/gui/qml/AccountBar.qml:18:1: Failed to extract plugin meta data from '/usr/lib64/qt6/qml/org/ownCloud/gui/libowncloudGuiplugin.so': '/usr/lib64/qt6/qml/org/ownCloud/gui/libowncloudGuiplugin.so' is not a Qt plugin (metadata not found) import org.ownCloud.gui 1.0 ^) ``` Pass GENERATE_PLUGIN_SOURCE to fix the startup problem. [0] commit 4e9b73da40792ece7885924007441880ecc06d8d Bug: https://bugs.gentoo.org/964420 (cherry picked from commit 77b6f16) Co-authored-by: Sam James <sam@cmpct.info> Co-authored-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
1 parent 583e8cb commit 81e88a8

4 files changed

Lines changed: 8 additions & 0 deletions

File tree

changelog/unreleased/12374.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Bugfix: Fix compatibility with extra-cmake-modules-6.19.0
2+
3+
Fix runtime crash at startup with ECM 6.19.
4+
5+
https://github.com/owncloud/client/pull/12374

src/gui/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ ecm_add_qml_module(owncloudGui
119119
URI org.ownCloud.gui
120120
VERSION 1.0
121121
NAMESPACE OCC
122+
GENERATE_PLUGIN_SOURCE
122123
QML_FILES
123124
qml/AccountBar.qml
124125
qml/AccountButton.qml

src/libsync/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ ecm_add_qml_module(libsync
100100
URI org.ownCloud.libsync
101101
VERSION 1.0
102102
NAMESPACE OCC
103+
GENERATE_PLUGIN_SOURCE
103104
)
104105

105106
ecm_finalize_qml_module(libsync DESTINATION ${KDE_INSTALL_QMLDIR})

src/resources/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ ecm_add_qml_module(owncloudResources
4545
URI org.ownCloud.resources
4646
VERSION 1.0
4747
NAMESPACE OCC
48+
GENERATE_PLUGIN_SOURCE
4849
)
4950

5051
ecm_finalize_qml_module(owncloudResources DESTINATION ${KDE_INSTALL_QMLDIR})

0 commit comments

Comments
 (0)