summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32/msvc_vcxproj.cpp
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-05-14 03:13:30 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-05-14 03:13:30 (GMT)
commit2115c915ee0bb129ae6af82dce7138d52df7bfd7 (patch)
tree0da1ba2ee77e6bff81521d05536faf2819f77bd3 /qmake/generators/win32/msvc_vcxproj.cpp
parent75c4dea93ad415dd9c79cb57ec5598e38789b28d (diff)
parent124e9a761b3cab7414d3ddeaa8e8f2455b6598ad (diff)
downloadQt-2115c915ee0bb129ae6af82dce7138d52df7bfd7.zip
Qt-2115c915ee0bb129ae6af82dce7138d52df7bfd7.tar.gz
Qt-2115c915ee0bb129ae6af82dce7138d52df7bfd7.tar.bz2
Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squash
Diffstat (limited to 'qmake/generators/win32/msvc_vcxproj.cpp')
-rw-r--r--qmake/generators/win32/msvc_vcxproj.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp
index da93fe3..05c1511 100644
--- a/qmake/generators/win32/msvc_vcxproj.cpp
+++ b/qmake/generators/win32/msvc_vcxproj.cpp
@@ -89,7 +89,6 @@ bool VcxprojGenerator::writeMakefile(QTextStream &t)
return true;
}
return project->isActiveConfig("build_pass");
- return true;
}