diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-02-23 10:56:52 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-02-23 10:56:52 +0100 |
| commit | 7c3cfa166d6b54c792f1c452a162bd7842becd52 (patch) | |
| tree | 404f58894cfebcf6fb62e9eab60b3fb33a3f6f44 /src/plugins/bookmarks | |
| parent | 31a55b02477fa0c6b9b9fca7e26ebc6951c3be30 (diff) | |
| parent | 09a7247bfc08e5d8e027493909c2acb448a0bd8e (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/plugins/coreplugin/helpmanager.cpp
Change-Id: I2feb60ec0afb2f22f75dc137a01c3fa217b299d8
Diffstat (limited to 'src/plugins/bookmarks')
| -rw-r--r-- | src/plugins/bookmarks/bookmarkfilter.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/bookmarks/bookmarkfilter.h b/src/plugins/bookmarks/bookmarkfilter.h index e665cc2f5d..ff378d9a90 100644 --- a/src/plugins/bookmarks/bookmarkfilter.h +++ b/src/plugins/bookmarks/bookmarkfilter.h @@ -34,6 +34,7 @@ class BookmarkManager; class BookmarkFilter : public Core::ILocatorFilter { + Q_OBJECT public: explicit BookmarkFilter(BookmarkManager *manager); QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, |