diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-24 06:58:17 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-24 07:37:47 (GMT) |
| commit | 409d41185e85f2eefe6bb4872c4dd3005bef8170 (patch) | |
| tree | 09698019db65369d715aa4c4e57ad97eb84f953a /qmake/generators | |
| parent | fdd6436987a114521168f48b9b96013772af7d49 (diff) | |
| download | Qt-409d41185e85f2eefe6bb4872c4dd3005bef8170.zip Qt-409d41185e85f2eefe6bb4872c4dd3005bef8170.tar.gz Qt-409d41185e85f2eefe6bb4872c4dd3005bef8170.tar.bz2 | |
qmake vc[x]proj generators: support /MAP option without file name
Task-number: QTBUG-13081
Reviewed-by: Martin Petersson
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 3 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index 17c4d5a..2505056 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -1573,7 +1573,8 @@ bool VCXLinkerTool::parseOption(const char* option) break; case 0x0034160: // /MAP[:filename] GenerateMapFile = _True; - MapFileName = option+5; + if (option[4] == ':') + MapFileName = option+5; break; case 0x164e1ef: // /MAPINFO:{EXPORTS} if(*(option+9) == 'E') diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 1e060a0..980e686 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -1430,7 +1430,8 @@ bool VCLinkerTool::parseOption(const char* option) break; case 0x0034160: // /MAP[:filename] GenerateMapFile = _True; - MapFileName = option+5; + if (option[4] == ':') + MapFileName = option+5; break; case 0x164e1ef: // /MAPINFO:{EXPORTS|LINES} if(*(option+9) == 'E') |