diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-06 21:42:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 16:40:07 +0200 |
| commit | 86d1f7a61bb2b3cbaf2de8d030ae74cb2c2a1a13 (patch) | |
| tree | bef2459834d0a456bce4b6c5704cb4c8dbda4784 /qmake/generators | |
| parent | 3c2f56aaf24556e381dbb71b3d6edfdc4a7d672e (diff) | |
remove not particularly useful branch
we just determined that the file does not exist, so it's entirely
pointless to query its type from the file system. consequently, the
respective fallback branch would assume a regular file anyway.
Change-Id: I42590ffc2a5f650fb430a9398cb1859217ed4350
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/generators')
| -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; |