diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-02 08:54:38 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-02 08:54:38 (GMT) |
| commit | b31819a2871f0479da59c01d9fc7469d36120c2b (patch) | |
| tree | 66a52c719c144295a3adf9d6d7b4cff3a63c13ea /qmake/generators | |
| parent | d52fb58f34199e9a6e008929425cd21b92a2674a (diff) | |
| parent | d018549a25761b5e50d90939d94384f23d7a01e0 (diff) | |
| download | Qt-b31819a2871f0479da59c01d9fc7469d36120c2b.zip Qt-b31819a2871f0479da59c01d9fc7469d36120c2b.tar.gz Qt-b31819a2871f0479da59c01d9fc7469d36120c2b.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/selftests/expected_skip.txt
tests/auto/selftests/tst_selftests.cpp
Diffstat (limited to 'qmake/generators')
| -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 |