Showing the changes to libraries/script-engine/src/FileScriptingInterface.cpp (1 of 33 files). Show all
Unified · Split
| @@ -9,21 +9,25 @@ · 8 unmodified lines | ||
| 9 | 9 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html |
| 10 | 10 | // |
| 11 | 11 | |
| 12 | −#include <QTemporaryDir> | |
| 13 | −#include <QDir> | |
| 14 | −#include <QFile> | |
| 15 | −#include <QDebug> | |
| 16 | −#include <QBuffer> | |
| 17 | −#include <QTextCodec> | |
| 18 | −#include <QIODevice> | |
| 19 | −#include <QUrl> | |
| 20 | −#include <QByteArray> | |
| 21 | −#include <QString> | |
| 22 | −#include <QFileInfo> | |
| 12 | +#include "FileScriptingInterface.h" | |
| 13 | + | |
| 14 | +#include <QtCore/QTemporaryDir> | |
| 15 | +#include <QtCore/QDir> | |
| 16 | +#include <QtCore/QFile> | |
| 17 | +#include <QtCore/QDebug> | |
| 18 | +#include <QtCore/QBuffer> | |
| 19 | +#include <QtCore/QTextCodec> | |
| 20 | +#include <QtCore/QIODevice> | |
| 21 | +#include <QtCore/QUrl> | |
| 22 | +#include <QtCore/QByteArray> | |
| 23 | +#include <QtCore/QString> | |
| 24 | +#include <QtCore/QFileInfo> | |
| 25 | + | |
| 26 | +#if !defined(Q_OS_ANDROID) | |
| 23 | 27 | #include <quazip5/quazip.h> |
| 24 | 28 | #include <quazip5/JlCompress.h> |
| 29 | +#endif | |
| 25 | 30 | |
| 26 | −#include "FileScriptingInterface.h" | |
| 27 | 31 | #include "ResourceManager.h" |
| 28 | 32 | #include "ScriptEngineLogging.h" |
| 29 | 33 | |
| @@ -68,7 +72,9 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool · 38 unmodified lines | ||
| 68 | 72 | } |
| 69 | 73 | |
| 70 | 74 | QStringList FileScriptingInterface::unzipFile(QString path, QString tempDir) { |
| 71 | − | |
| 75 | +#if defined(Q_OS_ANDROID) | |
| 76 | + return QStringList(); | |
| 77 | +#else | |
| 72 | 78 | QDir dir(path); |
| 73 | 79 | QString dirName = dir.path(); |
| 74 | 80 | qCDebug(scriptengine) << "Directory to unzip: " << dirName; |
| @@ -83,7 +89,7 @@ QStringList FileScriptingInterface::unzipFile(QString path, QString tempDir) { · 8 unmodified lines | ||
| 83 | 89 | qCDebug(scriptengine) << "Extraction failed"; |
| 84 | 90 | return list; |
| 85 | 91 | } |
| 86 | − | |
| 92 | +#endif | |
| 87 | 93 | } |
| 88 | 94 | |
| 89 | 95 | // fix to check that we are only referring to a temporary directory |
| @@ -131,11 +137,12 @@ void FileScriptingInterface::recursiveFileScan(QFileInfo file, QString* dirName) · 41 unmodified lines | ||
| 131 | 137 | return; |
| 132 | 138 | }*/ |
| 133 | 139 | QFileInfoList files; |
| 134 | − | |
| 140 | +#if !defined(Q_OS_ANDROID) | |
| 135 | 141 | if (file.fileName().contains(".zip")) { |
| 136 | 142 | qCDebug(scriptengine) << "Extracting archive: " + file.fileName(); |
| 137 | 143 | JlCompress::extractDir(file.fileName()); |
| 138 | 144 | } |
| 145 | +#endif | |
| 139 | 146 | files = file.dir().entryInfoList(); |
| 140 | 147 | |
| 141 | 148 | /*if (files.empty()) { |