diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-18 15:23:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-18 15:23:29 +0200 |
| commit | 361fdad3be3421496be4dab014a8bee369687387 (patch) | |
| tree | 4412737d90b20953064b8f53817c014ddc9714c3 /src/plugins/cppeditor/cppquickfixes.cpp | |
| parent | 5e38bdbfd8bef6c3bdcede9fe0be11f34e9a0f7c (diff) | |
| parent | 41ae823bda7cc1bad4b85861d9b0e3087c130e4a (diff) | |
Merge remote-tracking branch 'origin/4.4'
Change-Id: I778acc044ac105a11054b314aecac5b1c2cfee6a
Diffstat (limited to 'src/plugins/cppeditor/cppquickfixes.cpp')
| -rw-r--r-- | src/plugins/cppeditor/cppquickfixes.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 67d360c3bb..640fa794ef 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -56,6 +56,7 @@ #include <utils/fancylineedit.h> #include <utils/qtcassert.h> +#include <utils/qtcfallthrough.h> #include <QApplication> #include <QComboBox> @@ -4119,7 +4120,7 @@ public: break; case FromReference: removeReferenceOperator(changes); - // fallthrough intended + Q_FALLTHROUGH(); case FromVariable: convertToPointer(changes); break; |