diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2009-05-29 08:07:06 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-05-29 09:00:05 (GMT) |
| commit | 909f96a4f92ad3c9fed1dc4c3873b638421568b0 (patch) | |
| tree | 38a7861aceee9dec0ea40ac0a81badac7db3ac5b /qmake | |
| parent | 87acb1722d9db66aa01d238b6e4ac90dfe095ff0 (diff) | |
| download | Qt-909f96a4f92ad3c9fed1dc4c3873b638421568b0.zip Qt-909f96a4f92ad3c9fed1dc4c3873b638421568b0.tar.gz Qt-909f96a4f92ad3c9fed1dc4c3873b638421568b0.tar.bz2 | |
Remove the fixFilename() usage from the solution generator
Only the Solution Generator was using the fixFilename() function, so
under some circumstances the solution filename wouldn't find the
correct vcproj file to include. This created a problem with
network-chat.vcproj.
Task-number: 254772
Reviewed-by: joao
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 8901289..13bc05b 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -574,7 +574,7 @@ void VcprojGenerator::writeSubDirs(QTextStream &t) } // We assume project filename is [QMAKE_ORIG_TARGET].vcproj - QString vcproj = unescapeFilePath(fixFilename(tmp_vcproj.project->first("QMAKE_ORIG_TARGET")) + project->first("VCPROJ_EXTENSION")); + QString vcproj = unescapeFilePath(tmp_vcproj.project->first("QMAKE_ORIG_TARGET") + project->first("VCPROJ_EXTENSION")); QString vcprojDir = qmake_getpwd(); // If file doesn't exsist, then maybe the users configuration |