diff options
author | Eric Lemanissier <eric.lemanissier@gmail.com> | 2020-05-26 16:51:08 +0000 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-05-26 20:28:05 +0000 |
commit | 076299dfe3c243899cf708d870ec41f3e1401af5 (patch) | |
tree | d4ae2699ae2598381da066d68d0b702e024d5dd0 | |
parent | e8505d9923ba48124bf82bf358f8629b3fcdc41b (diff) |
QMimeDatabase/xml: use xmlstarlet instead of xml
some distributions (eg Ubuntu) don't provide xml executable, but only xmlstarlet executable
Change-Id: Icc801ded8d4ec1ec4d1dab93289a2365f8cd9cbd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 370324f6e2f3ce7d250a1c3686918c08da1f8b06)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/corelib/mimetypes/mime/generate.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/mimetypes/mime/generate.pl b/src/corelib/mimetypes/mime/generate.pl index 0f87d61f8e..4c1cb5bd9a 100644 --- a/src/corelib/mimetypes/mime/generate.pl +++ b/src/corelib/mimetypes/mime/generate.pl @@ -67,9 +67,9 @@ if ($fname eq "--zstd") { # Check if xml (from xmlstarlet) is in $PATH my $cmd; -if (checkCommand("xml")) { +if (checkCommand("xmlstarlet")) { # Minify the data before compressing - $cmd = "xml sel -D -B -t -c / $fname"; + $cmd = "xmlstarlet sel -D -B -t -c / $fname"; $cmd .= "| $compress" if $compress; } elsif ($compress) { $cmd = "$compress < $fname" |