diff options
| author | hjk <hjk@qt.io> | 2022-08-05 08:48:22 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-08-05 08:50:27 +0200 |
| commit | ed8c775defe375bdd1b6f0812352baebf4294001 (patch) | |
| tree | c886e5eec54e1057972eafcf179ee8e1f46ef6df /src/plugins/texteditor/textmark.h | |
| parent | 0da5ade118a62b09c6da608e813237c63f0bed19 (diff) | |
| parent | 5d85c4dbdf2e62d5188831c8ef082cf2a009a090 (diff) | |
Merge remote-tracking branch 'origin/8.0'
Change-Id: Icbb87ac8bcee5fb86042d3863a973573510651b4
Diffstat (limited to 'src/plugins/texteditor/textmark.h')
| -rw-r--r-- | src/plugins/texteditor/textmark.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h index 0e94728103..5112694256 100644 --- a/src/plugins/texteditor/textmark.h +++ b/src/plugins/texteditor/textmark.h @@ -130,6 +130,7 @@ public: QVector<QAction *> actions() const; void setActions(const QVector<QAction *> &actions); // Takes ownership + void setActionsProvider(const std::function<QList<QAction *>()> &actionsProvider); // Takes ownership protected: void setSettingsPage(Utils::Id settingsPage); @@ -150,8 +151,9 @@ private: QString m_toolTip; std::function<QString()> m_toolTipProvider; QString m_defaultToolTip; - QVector<QAction *> m_actions; - QAction *m_settingsAction = nullptr; + QVector<QAction *> m_actions; // FIXME Remove in master + std::function<QList<QAction *>()> m_actionsProvider; + Utils::Id m_settingsPage; }; } // namespace TextEditor |