feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix compile with gcc 5.3

Browse Source 
Amends 26c26c0dad.

Change-Id: I019759179626df45a31492846e05b1dca55f4fea
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Stenger
2020-06-02 13:29:40 +02:00
parent 5b364de168
commit 304a417de0
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/utils/archive.cpp
View File

@@ -45,20 +45,20 @@ struct Tool
};
const QVector<Tool> 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<Tool> toolsForMimeType(const Utils::MimeType &mimeType)