diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 14:27:27 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 14:27:27 +0100 |
| commit | d9a3e03934076aea8852f1c4b142a5ecfeea0297 (patch) | |
| tree | 6832178b5dddb8bf4dc61590265a638133f8bcfd /src/designer/src/components/taskmenu/groupbox_taskmenu.h | |
| parent | 4c0ba237eabf66e028459e86620c448c4e21760a (diff) | |
| parent | 64221433d7a82955b111e20178c9527cb0373914 (diff) | |
| download | qttools-d9a3e03934076aea8852f1c4b142a5ecfeea0297.tar.gz | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ia86822a3b64be4e17d525f6b055eadfab7215bc8
Diffstat (limited to 'src/designer/src/components/taskmenu/groupbox_taskmenu.h')
| -rw-r--r-- | src/designer/src/components/taskmenu/groupbox_taskmenu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.h b/src/designer/src/components/taskmenu/groupbox_taskmenu.h index e09a883a0..d963e44a8 100644 --- a/src/designer/src/components/taskmenu/groupbox_taskmenu.h +++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.h @@ -49,11 +49,11 @@ public: explicit GroupBoxTaskMenu(QGroupBox *groupbox, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private: QAction *m_editTitleAction; - QList<QAction*> m_taskActions; + QVector<QAction*> m_taskActions; }; typedef ExtensionFactory<QDesignerTaskMenuExtension, QGroupBox, GroupBoxTaskMenu> GroupBoxTaskMenuFactory; |