diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-24 01:00:12 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-24 01:00:13 +0200 |
| commit | cb10ec56f733c34d23c9e5511b19c1e508d0f13f (patch) | |
| tree | fa13d79ef22a0b1e28febbba116018e469237c2a /qmake/generators/win32/msvc_objectmodel.h | |
| parent | 9dfc2aa75d930c6676f901e817bbc8c900a966f5 (diff) | |
| parent | 2947435d8737f9b97a80532864ec2302f6719355 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I26da00aa71b0f0b91c9bfb4a9e8550345ee62875
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.h')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index 33a96bf85e..b356f1bb73 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -526,6 +526,7 @@ public: triState ImproveFloatingPointConsistency; inlineExpansionOption InlineFunctionExpansion; triState KeepComments; + QString LanguageStandard; triState MinimalRebuild; QString ObjectFile; triState OmitDefaultLibName; |