diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index c7a5325910..4cfcf35cb8 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1267,7 +1267,6 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n if(!target.isEmpty()) target += "\t"; QString dst_file = filePrefixRoot(root, dst); - QFileInfo fi(fileInfo(wild)); QString cmd; if (installConfigValues.contains("directory")) { cmd = QLatin1String("-$(INSTALL_DIR)"); @@ -1276,10 +1275,8 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n dst_file += fi.fileName(); } else if (installConfigValues.contains("executable")) { cmd = QLatin1String("-$(INSTALL_PROGRAM)"); - } else if (installConfigValues.contains("data")) { - cmd = QLatin1String("-$(INSTALL_FILE)"); } else { - cmd = QString(fi.isExecutable() ? "-$(INSTALL_PROGRAM)" : "-$(INSTALL_FILE)"); + cmd = QLatin1String("-$(INSTALL_FILE)"); } cmd += " " + escapeFilePath(wild) + " " + escapeFilePath(dst_file) + "\n"; target += cmd; |