diff --git a/README b/README index 7c62a99..4137e28 100644 --- a/README +++ b/README @@ -17,12 +17,11 @@ TLDR for packagers Packages with system-wide QML modules get Provides like `qt5qmlimport(QtQuick.Controls.2) = 15` automatically. Imports in .qml files -map to RPM requires like `qt5qmlimport(QtQuick.Controls.2) >= 15`, but this is -currently opt-in and has to be enabled with `%global %_enable_qml_requires 1` -in .spec files. After adding that, it's important to check that all -dependendencies are fulfilled, as in some cases a needed `qmlimport` Provides -is missing. See the "Internal and private exports" section for how to deal with -that. +map to RPM requires like `qt5qmlimport(QtQuick.Controls.2) >= 15`. This can be +disabled with `%global %_disable_qml_requires 1` in .spec files. It's important +to check that all dependendencies are fulfilled, as in some cases a needed +`qmlimport` Provides is missing. See the "Internal and private exports" section +for how to deal with that. How the QML engine imports modules ---------------------------------- @@ -75,12 +74,6 @@ possible per subpackage): `%global %__qml_requires_opts --qtver 5` -To avoid that missing qmlimport provides (see "Internal and private exports") -make previously working packages unresolvable, generation of requires is opt-in -and needs to be enabled by defining `%_enable_qml_requires`: - -`%global %_enable_qml_requires 1` - Currently, only .qml files directly part of the package are handled, so if those are part of a resources file embedded into an executable or library, they will not be read. Making this possible needs more research and effort. diff --git a/qml-autoreqprov.changes b/qml-autoreqprov.changes index a3eeda9..86ca116 100644 --- a/qml-autoreqprov.changes +++ b/qml-autoreqprov.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 27 08:54:39 UTC 2021 - Fabian Vogt + +- Convert the opt-in for qml.req to an opt-out + ------------------------------------------------------------------- Fri Jan 15 15:40:18 UTC 2021 - Fabian Vogt diff --git a/qml.attr b/qml.attr index 120588d..010707a 100644 --- a/qml.attr +++ b/qml.attr @@ -1,4 +1,4 @@ %__qml_requires %{_rpmconfigdir}/qml.req %__qml_path \\.qml$ -# Exclude everything unless _enable_qml_requires is set -%__qml_exclude_path %nil%{?!_enable_qml_requires:\\.qml$} +# Exclude everything if _disable_qml_requires is set +%__qml_exclude_path %nil%{?_disable_qml_requires:\\.qml$}