diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-05-19 04:02:17 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-05-19 04:02:17 (GMT) |
| commit | 2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315 (patch) | |
| tree | 9eaf0842a9cd6f719e2d64866b806a84f57f8e1e /qmake/generators | |
| parent | 730bfd80804899771b39998c5b67e604d2192ecd (diff) | |
| parent | dcfe68f66e5162f9f7a05552aa1133cdc1f0f9c3 (diff) | |
| download | Qt-2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315.zip Qt-2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315.tar.gz Qt-2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.7-from-4.6
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/makefile.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 0d00266..4c4f5bc 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1277,13 +1277,26 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n } QString local_dirstr = Option::fixPathToLocalOS(dirstr, true); QStringList files = QDir(local_dirstr).entryList(QStringList(filestr)); - if(project->values((*it) + ".CONFIG").indexOf("no_check_exist") != -1 && files.isEmpty()) { + const QStringList &installConfigValues = project->values((*it) + ".CONFIG"); + if (installConfigValues.contains("no_check_exist") && files.isEmpty()) { if(!target.isEmpty()) target += "\t"; QString dst_file = filePrefixRoot(root, dst); QFileInfo fi(fileInfo(wild)); - QString cmd = QString(fi.isExecutable() ? "-$(INSTALL_PROGRAM)" : "-$(INSTALL_FILE)") + " " + - wild + " " + dst_file + "\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(); + } 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 += " " + wild + " " + dst_file + "\n"; target += cmd; if(!uninst.isEmpty()) uninst.append("\n\t"); |