diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 16:31:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 16:31:33 (GMT) |
| commit | 780c0df56bc93fda950ce6fc4794d99629fc64c2 (patch) | |
| tree | 872d071a014dbe4047ffb6b720531db3bedbb42c /qmake | |
| parent | 03eae990b1aea880ee863061e1429edc4a96c626 (diff) | |
| parent | be41deb3868de28187aba5743f71a71f8498e4c7 (diff) | |
| download | Qt-780c0df56bc93fda950ce6fc4794d99629fc64c2.zip Qt-780c0df56bc93fda950ce6fc4794d99629fc64c2.tar.gz Qt-780c0df56bc93fda950ce6fc4794d99629fc64c2.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix regexp
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index db2737b..d949b63 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1237,7 +1237,7 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n target += "\n"; do_default = false; for(QStringList::Iterator wild_it = tmp.begin(); wild_it != tmp.end(); ++wild_it) { - QString wild = Option::fixPathToLocalOS((*wild_it), false, false); + QString wild = Option::fixPathToTargetOS((*wild_it), false, false); QString dirstr = qmake_getpwd(), filestr = wild; int slsh = filestr.lastIndexOf(Option::dir_sep); if(slsh != -1) { |