summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2019-11-13 14:23:41 +0200
committerKatja Marttila <katja.marttila@qt.io>2019-11-19 09:18:38 +0000
commit7bac504eb60c9783f29632c4f405eb61ca9236c5 (patch)
treef712d34cf1a269a181cb5cfd4c19513e397ede51 /tools
parent9c2a50721500cdff345d809938076cce0963d888 (diff)
Fix installer executable creation in Linux3.1.2-rc3
If Linux has several partitions and tmp is pointing to a different partition than where we are trying to create installer executable with binarycreator, binarycreator fails with 'Invalid cross-device link'. Fixed so that tmp is not used when creating an installer executable. Change-Id: Ieee52ee1929f980345a7940dd381cc94dbf3d40e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/binarycreator/binarycreator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp
index f9a8f31d4..a18690a73 100644
--- a/tools/binarycreator/binarycreator.cpp
+++ b/tools/binarycreator/binarycreator.cpp
@@ -409,7 +409,8 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt
}
#endif
- QTemporaryFile out;
+ QFile out(generateTemporaryFileName());
+
QString targetName = input.outputPath;
#ifdef Q_OS_MACOS
QDir resourcePath(QFileInfo(input.outputPath).dir());
@@ -470,7 +471,6 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt
QFile::remove(tempFile);
return EXIT_FAILURE;
}
- out.setAutoRemove(false);
#ifndef Q_OS_WIN
chmod755(out.fileName());