diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-08-07 09:42:02 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-08-07 09:42:02 +0200 |
| commit | 847787f146b2583167f9d4bdbfb912c075b4af15 (patch) | |
| tree | 822cac1939880b28b90ab78cf9c7aad8bccea6ce /src/plugins/cpptools | |
| parent | 141f19a65283d3b2ac5677068cd858e1ace10623 (diff) | |
| parent | ff10f8c3a58c2c57e221e294d5c4829c3fd05c15 (diff) | |
| download | qt-creator-847787f146b2583167f9d4bdbfb912c075b4af15.tar.gz | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/debugger/debuggerruncontrol.cpp
Change-Id: I72882df605bc3fc8a8d20118fd4e49207ac92664
Diffstat (limited to 'src/plugins/cpptools')
| -rw-r--r-- | src/plugins/cpptools/cppvirtualfunctionassistprovider.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppvirtualfunctionassistprovider.h b/src/plugins/cpptools/cppvirtualfunctionassistprovider.h index 52734bd71b..83de52594b 100644 --- a/src/plugins/cpptools/cppvirtualfunctionassistprovider.h +++ b/src/plugins/cpptools/cppvirtualfunctionassistprovider.h @@ -40,6 +40,7 @@ namespace CppTools { class CPPTOOLS_EXPORT VirtualFunctionAssistProvider : public TextEditor::IAssistProvider { + Q_OBJECT public: VirtualFunctionAssistProvider(); |