diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-06 21:45:58 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 16:40:07 +0200 |
| commit | c292f1dc8a7e3ca64db9478465ffc7013bbfa4ac (patch) | |
| tree | c32fb08cec0f821aea03171e564e4ca5d8c1d797 | |
| parent | 37cc4a649999d20f4eab562d92bd7a704578e650 (diff) | |
respect copy_dir_files with manually flagged directories as well
otherwise the second installation on unix would be bogus.
Change-Id: I162533ee262c6820e7e2d4710b5342cafecd9d59
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | qmake/generators/makefile.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 4cfcf35cb8..3025a5cefe 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1270,9 +1270,11 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n QString cmd; if (installConfigValues.contains("directory")) { cmd = QLatin1String("-$(INSTALL_DIR)"); - if (!dst_file.endsWith(Option::dir_sep)) - dst_file += Option::dir_sep; - dst_file += fi.fileName(); + if (project->isActiveConfig("copy_dir_files")) { + if (!dst_file.endsWith(Option::dir_sep)) + dst_file += Option::dir_sep; + dst_file += filestr; + } } else if (installConfigValues.contains("executable")) { cmd = QLatin1String("-$(INSTALL_PROGRAM)"); } else { |