diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-03 11:17:12 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-03 12:18:02 +0200 |
| commit | 3b76714290da72eff10ed251263146bb59713ca5 (patch) | |
| tree | e107f900b968e524b7c38fd833c66383cc449438 /src/plugins/cpptools/compileroptionsbuilder.h | |
| parent | 5b8846a4f889d9e700b9625ffefd8b22f64ea41e (diff) | |
| parent | 1074dab46703d80718ccda079f20e5e92c90257e (diff) | |
| download | qt-creator-3b76714290da72eff10ed251263146bb59713ca5.tar.gz | |
Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RowSpecifics.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml
Change-Id: Ie5deacd39ae4f3c0966e7cb41a8fd832dcefbb09
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.h')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h index cfaeecdea8..a83aba7466 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.h +++ b/src/plugins/cpptools/compileroptionsbuilder.h @@ -68,6 +68,7 @@ public: void addExtraCodeModelFlags(); void addPicIfCompilerFlagsContainsIt(); void addCompilerFlags(); + void addMsvcExceptions(); void enableExceptions(); void insertWrappedQtHeaders(); void insertWrappedMingwHeaders(); |