diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 15:54:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 15:54:51 (GMT) |
| commit | 3671dbf34940e166b747b6f8f3f5758fd486073c (patch) | |
| tree | 73dfe3d7d5150f4f6cbeac8ead747eedfd323123 /qmake | |
| parent | 194013d9db1b3e4ba6f56a864f3b64f523202948 (diff) | |
| parent | 3343298448da3f2546b0708670effb798f762c5c (diff) | |
| download | Qt-3671dbf34940e166b747b6f8f3f5758fd486073c.zip Qt-3671dbf34940e166b747b6f8f3f5758fd486073c.tar.gz Qt-3671dbf34940e166b747b6f8f3f5758fd486073c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (153 commits)
Use QTRY_COMPARE after QTest::qWaitForWindowShown()
Use the new memory cost reporting API in QtScript Custom Class example
QtScript: Add API for reporting additional memory costs
Add experimental support for StaticContents in Mac OS X.
Fix misspelling in function name.
don't just return the first key here.
Fix CI sytem build breakage.
Fix crash.
Compile with QT_NO_NETWORKINTERFACE defined.
Don't emit signals in constructor.
Remove unused code.
fix multiple promps for keychain access when connecting to wifi network
not all interfaces should be active
Update changelog
Fix qcombobox:flaggedItems autotest failure.
Wrong value for PM_ScrollBarExtent on Windows XP.
doc: Fixed all the remaining qdoc errors. For now.
Do not move keyboard focus to invisible windows on X11.
Do not use _NET_ACTIVE_WINDOW for nonmanaged windows.
Revert "Revert "Make QWidget::activateWindow() NET window manager aware.""
...
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 5 |
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)"; |