History

Fixed merge conflicts with master

Elisa Lupin-Jimenez committed 9 years ago

Commit 1102b272 parents 310a0ee 153b5cb132 files · +4372 −1573Browse files

Showing the changes to libraries/script-engine/src/FileScriptingInterface.cpp (1 of 132 files). Show all

Unified · Split

libraries/script-engine/src/FileScriptingInterface.cpp+3−4
@@ -40,8 +40,8 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool · 39 unmodified lines
40 if (!isZip) {40 if (!isZip) {
41 tempDir.remove(fileName);41 tempDir.remove(fileName);
42 } else {42 } else {
43 QTemporaryDir blocks;43 QTemporaryDir zipTemp;
44 tempDir = blocks.path();44 tempDir = zipTemp.path();
45 path.remove("file:///");45 path.remove("file:///");
46 }46 }
47 47
@@ -76,8 +76,7 @@ QStringList FileScriptingInterface::unzipFile(QString path, QString tempDir) { · 28 unmodified lines
76 76
77 if (!list.isEmpty()) {77 if (!list.isEmpty()) {
78 return list;78 return list;
79 }79 } else {
80 else {
81 qCDebug(scriptengine) << "Extraction failed";80 qCDebug(scriptengine) << "Extraction failed";
82 return list;81 return list;
83 }82 }