diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/devtool/binaryreplace.cpp | 4 | ||||
| -rw-r--r-- | tools/devtool/main.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/devtool/binaryreplace.cpp b/tools/devtool/binaryreplace.cpp index 131bd5ea5..d248015a0 100644 --- a/tools/devtool/binaryreplace.cpp +++ b/tools/devtool/binaryreplace.cpp @@ -64,8 +64,8 @@ int BinaryReplace::replace(const QString &source, const QString &target) QFutureWatcher<QInstaller::FileTaskResult> taskWatcher; if (url.isRelative() || url.isLocalFile()) { taskWatcher.setFuture(QtConcurrent::run(&QInstaller::CopyFileTask::doTask, - new QInstaller::CopyFileTask(QInstaller::FileTaskItem(QFileInfo(source) - .absoluteFilePath())))); + new QInstaller::CopyFileTask(QInstaller::FileTaskItem(url.isRelative() + ? QFileInfo(source).absoluteFilePath() : url.toLocalFile())))); } else { taskWatcher.setFuture(QtConcurrent::run(&QInstaller::DownloadFileTask::doTask, new QInstaller::DownloadFileTask(QInstaller::FileTaskItem(url.toString())))); diff --git a/tools/devtool/main.cpp b/tools/devtool/main.cpp index 2c4fad8cf..9ef611ce2 100644 --- a/tools/devtool/main.cpp +++ b/tools/devtool/main.cpp @@ -120,6 +120,7 @@ int main(int argc, char *argv[]) fi.setFile(bundlePath); path = fi.absolutePath() + QLatin1Char('/') + fi.baseName() + QLatin1String(".dat"); + tmp.close(); tmp.setFileName(path); QInstaller::openForRead(&tmp); |