summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2010-03-25 19:27:05 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2010-03-25 19:27:05 (GMT)
commit986873b239f15df43a3ebbc88a38f8ff8d6d07bf (patch)
tree946f585f390d3abb835a3280bbdc6bc90724977c /qmake
parentb7f48eee301e973fcfae08dfd8997538b6dbe251 (diff)
parent3671dbf34940e166b747b6f8f3f5758fd486073c (diff)
downloadQt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.zip
Qt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.tar.gz
Qt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.tar.bz2
Merge remote branch 'origin/4.7' into 4.7
Conflicts: tools/qdoc3/generator.cpp tools/qdoc3/node.cpp
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/makefile.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index b9d2445..29a2422 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1245,7 +1245,8 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n
}
if(!dirstr.endsWith(Option::dir_sep))
dirstr += Option::dir_sep;
- if(exists(wild)) { //real file
+ bool is_target = (wild == fileFixify(var("TARGET"), FileFixifyAbsolute));
+ if(is_target || exists(wild)) { //real file or target
QString file = wild;
QFileInfo fi(fileInfo(wild));
if(!target.isEmpty())
@@ -1259,7 +1260,7 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n
QString cmd;
if (fi.isDir())
cmd = "-$(INSTALL_DIR)";
- else if (fi.isExecutable())
+ else if (is_target || fi.isExecutable())
cmd = "-$(INSTALL_PROGRAM)";
else
cmd = "-$(INSTALL_FILE)";