From 304a417de0ed6036c01790d8f8cf954ca58b036f Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 2 Jun 2020 13:29:40 +0200 Subject: [PATCH] Utils: Fix compile with gcc 5.3 Amends 26c26c0dada6b057. Change-Id: I019759179626df45a31492846e05b1dca55f4fea Reviewed-by: Alessandro Portale --- src/libs/utils/archive.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libs/utils/archive.cpp b/src/libs/utils/archive.cpp index 0ea6a920f22..74c24c7f869 100644 --- a/src/libs/utils/archive.cpp +++ b/src/libs/utils/archive.cpp @@ -45,20 +45,20 @@ struct Tool }; const QVector sTools = { - {"unzip", {"-o", "%{src}", "-d", "%{dest}"}, {"application/zip"}}, - {"7z", {"x", "-o%{dest}", "-y", "%{src}"}, {"application/zip", "application/x-7z-compressed"}}, - {"tar", + {{"unzip"}, {"-o", "%{src}", "-d", "%{dest}"}, {"application/zip"}}, + {{"7z"}, {"x", "-o%{dest}", "-y", "%{src}"}, {"application/zip", "application/x-7z-compressed"}}, + {{"tar"}, {"xvf", "%{src}"}, {"application/zip", "application/x-tar", "application/x-7z-compressed"}}, - {"tar", {"xvzf", "%{src}"}, {"application/x-compressed-tar"}}, - {"tar", {"xvJf", "%{src}"}, {"application/x-xz-compressed-tar"}}, - {"tar", {"xvjf", "%{src}"}, {"application/x-bzip-compressed-tar"}}, - {"cmake", + {{"tar"}, {"xvzf", "%{src}"}, {"application/x-compressed-tar"}}, + {{"tar"}, {"xvJf", "%{src}"}, {"application/x-xz-compressed-tar"}}, + {{"tar"}, {"xvjf", "%{src}"}, {"application/x-bzip-compressed-tar"}}, + {{"cmake"}, {"-E", "tar", "xvf", "%{src}"}, {"application/zip", "application/x-tar", "application/x-7z-compressed"}}, - {"cmake", {"-E", "tar", "xvzf", "%{src}"}, {"application/x-compressed-tar"}}, - {"cmake", {"-E", "tar", "xvJf", "%{src}"}, {"application/x-xz-compressed-tar"}}, - {"cmake", {"-E", "tar", "xvjf", "%{src}"}, {"application/x-bzip-compressed-tar"}}, + {{"cmake"}, {"-E", "tar", "xvzf", "%{src}"}, {"application/x-compressed-tar"}}, + {{"cmake"}, {"-E", "tar", "xvJf", "%{src}"}, {"application/x-xz-compressed-tar"}}, + {{"cmake"}, {"-E", "tar", "xvjf", "%{src}"}, {"application/x-bzip-compressed-tar"}}, }; static QVector toolsForMimeType(const Utils::MimeType &mimeType)