diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2014-06-05 12:30:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-06 08:49:06 +0200 |
| commit | dbc7ed82149d8915a32489a0d3a930d2793c6e65 (patch) | |
| tree | ccc00bfccad1d1787b8464c9c830e3c4eafdfcdb | |
| parent | 3441738d5f63f2d147bfcd37351be48c66ec5181 (diff) | |
Ensure that there is no duplication of the output directory in output
When a relative path was specified as the output then it would be in both
Option::output_dir and Option::output. Therefore in that case
Option::output should be just the filename as Option::output_dir has the
correct path to output to.
Task-number: QTBUG-39460
Change-Id: Idc988e6bad94f34b89660fb5e8d6fa3a39dc623b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | qmake/main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index f5116ba752..82573a61fc 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -252,8 +252,10 @@ int runQMake(int argc, char **argv) #endif if(!dir.isNull() && dir != ".") Option::output_dir = dir; - if(QDir::isRelativePath(Option::output_dir)) + if (QDir::isRelativePath(Option::output_dir)) { + Option::output.setFileName(fi.fileName()); Option::output_dir.prepend(oldpwd + QLatin1Char('/')); + } Option::output_dir = QDir::cleanPath(Option::output_dir); } |