diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-18 21:03:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-18 21:03:08 (GMT) |
| commit | 730bfd80804899771b39998c5b67e604d2192ecd (patch) | |
| tree | cb4e7f22e4bc4f991da98113c8f98cdea8bd4a23 /qmake/generators | |
| parent | 6d6b7b318a842ef5037065554f30ebfb4ae34d74 (diff) | |
| parent | 19bf1fec0ec3341fae97e27d3cb0baf8fb27b9f3 (diff) | |
| download | Qt-730bfd80804899771b39998c5b67e604d2192ecd.zip Qt-730bfd80804899771b39998c5b67e604d2192ecd.tar.gz Qt-730bfd80804899771b39998c5b67e604d2192ecd.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
re-add overriding of tool paths to configure
fix regexp
Support linked fonts (.ltt) from standard font locations.
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
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Fix QUrl::isValid if the host contains invalid caracter.
Fix anomaly demo control strip icon placement
QUrl: parsing of host name with an undercore.
Fixed race condition compiling xmlpatterns tests.
Remove qdbusserver from tests/auto/dbus.pro
QNAM HTTP: Preemptive anti crash if() statement
QNAM HTTP: More testcases
Fixing compiling issues.
Remove garbage test.
OpenVG blending modes from VG_KHR_advanced_blending extension
Fix spurious mouse click when dismissing a native menu
...
Diffstat (limited to 'qmake/generators')
| -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 29a2422..0d00266 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1236,7 +1236,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) { |