diff --git a/qml-autoreqprov.changes b/qml-autoreqprov.changes index 5c02892..98d6f7d 100644 --- a/qml-autoreqprov.changes +++ b/qml-autoreqprov.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Jan 21 12:11:19 UTC 2024 - Fabian Vogt + +- Bump version to 1.4 +- qml.req: + * Detect Qt version based on libQtCore presence. The previous method + broke if /usr/libexec/qtX or kf5-filesystem were present. +- qmldirreqprov.sh: + * Generate unversioned URI provides for plugin provided imports as well + ------------------------------------------------------------------- Tue Nov 14 23:57:17 UTC 2023 - Fabian Vogt diff --git a/qml-autoreqprov.spec b/qml-autoreqprov.spec index ead8c86..0488253 100644 --- a/qml-autoreqprov.spec +++ b/qml-autoreqprov.spec @@ -1,7 +1,7 @@ # # spec file for package qml-autoreqprov # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: qml-autoreqprov -Version: 1.3 +Version: 1.4 Release: 0 Summary: Automatic dependency generator for QML files and modules License: GPL-3.0-or-later diff --git a/qml.req b/qml.req index 9391769..a2055ed 100644 --- a/qml.req +++ b/qml.req @@ -25,7 +25,9 @@ qtver= [[ -n ${qtvers} ]] || qtvers="5 6 7" for ver in ${qtvers}; do - stat /usr/lib*/qt${ver} &>/dev/null && qtver="${qtver}${ver}" + if [ -e "/usr/lib/libQt${ver}Core.so.${ver}" ] || [ -e "/usr/lib64/libQt${ver}Core.so.${ver}" ]; then + qtver="${qtver}${ver}" + fi done # Zero or more than one version of Qt found. Abort. diff --git a/qmldirreqprov.sh b/qmldirreqprov.sh index d8917b5..b996564 100644 --- a/qmldirreqprov.sh +++ b/qmldirreqprov.sh @@ -101,6 +101,7 @@ while read file; do echo "Ignoring ${import}" >&2 continue fi + moduleExports["qt${qtver}qmlimport(${import%.*})"]="" # Provides for unversioned imports foundModuleExport "qt${qtver}qmlimport(${import})" "$min" done < <(qmlpluginexports-qt${qtver} "$plugin" "$module") done