diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-15 09:51:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-15 09:58:16 +0100 |
| commit | 9808b53fde1dfc65ad3757cc6720e430c3cc89a2 (patch) | |
| tree | a0517ae1e290e7bbdb118c9f01f4e6e5d744998c /qmake/generators/win32/msvc_objectmodel.cpp | |
| parent | c214379156e4c75dcfe59cf73d69b912f4293303 (diff) | |
| parent | 246fe271878dbe586b5f3222a78d67dfecd1ca83 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
configure
src/plugins/platforms/eglfs/qeglfsintegration.cpp
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 39898567a7..fb9c4f354d 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -1425,8 +1425,10 @@ bool VCLinkerTool::parseOption(const char* option) }else EnableUAC = _True; break; - case 0x3389797: // /DEBUG + case 0x3389797: // /DEBUG[:FASTLINK] GenerateDebugInformation = _True; + if (config->CompilerVersion >= NET2015 && strcmp(option + 7, "FASTLINK") == 0) + DebugInfoOption = linkerDebugOptionFastLink; break; case 0x0033896: // /DEF:filename ModuleDefinitionFile = option+5; |