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
4040 if (!isZip) {
4141 tempDir.remove(fileName);
4242 } else {
43− QTemporaryDir blocks;
44− tempDir = blocks.path();
43+ QTemporaryDir zipTemp;
44+ tempDir = zipTemp.path();
4545 path.remove("file:///");
4646 }
4747
@@ -76,8 +76,7 @@ QStringList FileScriptingInterface::unzipFile(QString path, QString tempDir) { · 28 unmodified lines
7676
7777 if (!list.isEmpty()) {
7878 return list;
79− }
80− else {
79+ } else {
8180 qCDebug(scriptengine) << "Extraction failed";
8281 return list;
8382 }