diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-02-13 18:32:18 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-02-14 09:02:52 +0000 |
| commit | 6c010fefea9945a492f7fb3885f7a23bbad63418 (patch) | |
| tree | 8ac624bac3a2ad56e8c4f8e4d644888735efbc1f /src | |
| parent | e4ceb32fe79c72e77b31db501dab61f1a72e1f6f (diff) | |
Remove the /KEEPTEMPFILES option
This option only worked for top-level makefiles and is therefore not very
useful for real-world builds. It would be quite some effort to make it
work for recursive builds.
Drop support for this option. A proper replacement is the /U option to
display the content of inline files.
Change-Id: Ibf24bd1e89ad10adb82d660ece25b1baae322b55
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/main.cpp | 1 | ||||
| -rw-r--r-- | src/jomlib/commandexecutor.cpp | 2 | ||||
| -rw-r--r-- | src/jomlib/options.cpp | 4 | ||||
| -rw-r--r-- | src/jomlib/options.h | 1 |
4 files changed, 1 insertions, 7 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 58f891e..91c1ad9 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -82,7 +82,6 @@ static void showUsage() "/DUMPGRAPH show the generated dependency graph\n" "/DUMPGRAPHDOT dump dependency graph in dot format\n" "/J <n> use up to n processes in parallel\n" - "/KEEPTEMPFILES keep all temporary files\n" "/VERSION print version and exit\n"); } diff --git a/src/jomlib/commandexecutor.cpp b/src/jomlib/commandexecutor.cpp index 1f05ef8..bd10324 100644 --- a/src/jomlib/commandexecutor.cpp +++ b/src/jomlib/commandexecutor.cpp @@ -275,7 +275,7 @@ void CommandExecutor::createTempFiles() fileName = inlineFile->m_filename; TempFile tempFile; - tempFile.keep = inlineFile->m_keep || m_pTarget->makefile()->options()->keepTemporaryFiles; + tempFile.keep = inlineFile->m_keep; tempFile.file = new QFile(fileName); if (!tempFile.file->open(QFile::WriteOnly)) { delete tempFile.file; diff --git a/src/jomlib/options.cpp b/src/jomlib/options.cpp index 28d8f1f..5cd7e6f 100644 --- a/src/jomlib/options.cpp +++ b/src/jomlib/options.cpp @@ -64,7 +64,6 @@ Options::Options() dumpDependencyGraphDot(false), displayMakeInformation(false), showUsageAndExit(false), - keepTemporaryFiles(false), displayBuildInfo(false), debugMode(false), showVersionAndExit(false) @@ -200,9 +199,6 @@ bool Options::handleCommandLineOption(const QStringList &originalArguments, QStr } else if (upperArg.startsWith(QLatin1String("ERRORREPORT"))) { arg.remove(0, 11); // ignore - we don't send stuff to Microsoft :) - } else if (upperArg.startsWith(QLatin1String("KEEPTEMPFILES"))) { - arg.remove(0, 13); - keepTemporaryFiles = true; } else if (upperArg.startsWith(QLatin1String("VERSION"))) { arg.remove(0, 7); showVersionAndExit = true; diff --git a/src/jomlib/options.h b/src/jomlib/options.h index 18152af..22adafc 100644 --- a/src/jomlib/options.h +++ b/src/jomlib/options.h @@ -64,7 +64,6 @@ public: bool displayBuildInfo; bool debugMode; bool showVersionAndExit; - bool keepTemporaryFiles; QString fullAppPath; QString stderrFile; |