diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-20 04:28:09 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-06-20 04:28:09 +0000 |
commit | d1ff9b419da5e3ace68479b02582222486ec9703 (patch) | |
tree | a978de6c9844cf37bbd7dc5cecc298bf51f4dce3 /qmake/generators/makefile.cpp | |
parent | 8a4ea3f03807c4d75ef73609dae30cfcf427c3ea (diff) | |
parent | ce09ef431373f45d14ce0a6e7de24aee3666093d (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'qmake/generators/makefile.cpp')
-rw-r--r-- | qmake/generators/makefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index d3221b7a25..a1f3352aa3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -176,7 +176,7 @@ MakefileGenerator::initOutPaths() #ifdef Q_OS_WIN // We don't want to add a separator for DLLDESTDIR on Windows (###why?) - if(!(dirs[x] == "DLLDESTDIR")) + if (dkey != "DLLDESTDIR") #endif { if(!pathRef.endsWith(Option::dir_sep)) |