diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-07-03 14:20:27 +0200 |
|---|---|---|
| committer | Jörg Bornemann <joerg.bornemann@qt.io> | 2019-08-03 12:48:29 +0000 |
| commit | 49a8aae6d3b254a0e1dcc3f997b6eb2dd1e6c7b7 (patch) | |
| tree | 369d86351fb320bfbe645c84f7419bcaf248acd5 /qmake/generators | |
| parent | a3de48eccc135bfc550d36646bf2ab555151239e (diff) | |
Remove special handling of DLLDESTDIR on Windows
In MakefileGenerator::initOutPaths() we ensure that directory
variables end with a directory separator, except for DLLDESTDIR.
There doesn't seem to be a valid reason for this exception.
Remove it for the sake of simplifying the code base.
Change-Id: I60eb01b410161e6e1d147d76f044f5140a7573bd
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/makefile.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 6034a9c5dd..2082bd6dc3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -167,14 +167,8 @@ MakefileGenerator::initOutPaths() ProString &pathRef = v[dkey].first(); pathRef = fileFixify(pathRef.toQString(), FileFixifyFromOutdir); -#ifdef Q_OS_WIN - // We don't want to add a separator for DLLDESTDIR on Windows (###why?) - if (dkey != "DLLDESTDIR") -#endif - { - if(!pathRef.endsWith(Option::dir_sep)) - pathRef += Option::dir_sep; - } + if (!pathRef.endsWith(Option::dir_sep)) + pathRef += Option::dir_sep; if (noIO() || (project->first("TEMPLATE") == "subdirs")) continue; |