Merge remote-tracking branch 'origin/11.0'

Change-Id: I87b22a73427cf9fc1b96075dc0db769ed3d3621c

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
index c59fd475bda..efcbd51569d 100644
--- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
+++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
@@ -16,12 +16,12 @@
 #include <app/app_version.h>
 #include <coreplugin/messagemanager.h>
 #include <texteditor/basehoverhandler.h>
-#include <utils/executeondestruction.h>
 #include <utils/qtcassert.h>
 #include <utils/textutils.h>
 
 #include <QCoreApplication>
 #include <QFile>
+#include <QScopeGuard>
 #include <QTextDocument>
 
 using namespace Core;
@@ -42,7 +42,7 @@ private:
             return;
         }
 
-        Utils::ExecuteOnDestruction reportPriority([this, report](){ report(priority()); });
+        const QScopeGuard cleanup([this, report] { report(priority()); });
 
         QTextCursor tc(editorWidget->document());
         tc.setPosition(pos);