summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-05-18 16:37:31 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-06-08 08:11:08 +0000
commitde3454fcaaea88ad0805814c231d796c9fbed2c7 (patch)
treeac1cd6b1601fc4ca588160e3f0ce41d695f2e84d /examples
parent131d08f789237cd59d108e8ca882a797089764f9 (diff)
Revert "Qt Designer: Migrate from QList to QVector"
This reverts commit ee87edebe6f934ec915b7cb4a0f5a28f73e9f221. The official class name will be QList. Task-number: QTBUG-84469 Change-Id: Ia6c1f0ed64b3ef3d5b8e0c0435ec76fbe76f867b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/designer/taskmenuextension/tictactoetaskmenu.cpp4
-rw-r--r--examples/designer/taskmenuextension/tictactoetaskmenu.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
index 4ea54e3ae..75d1f625c 100644
--- a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
+++ b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
@@ -81,9 +81,9 @@ QAction *TicTacToeTaskMenu::preferredEditAction() const
//! [2]
//! [3]
-QVector<QAction *> TicTacToeTaskMenu::taskActions() const
+QList<QAction *> TicTacToeTaskMenu::taskActions() const
{
- return {editStateAction};
+ return QList<QAction *>{editStateAction};
}
//! [3]
diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.h b/examples/designer/taskmenuextension/tictactoetaskmenu.h
index 8f0f9ce8a..a57ded625 100644
--- a/examples/designer/taskmenuextension/tictactoetaskmenu.h
+++ b/examples/designer/taskmenuextension/tictactoetaskmenu.h
@@ -70,7 +70,7 @@ public:
explicit TicTacToeTaskMenu(TicTacToe *tic, QObject *parent);
QAction *preferredEditAction() const override;
- QVector<QAction *> taskActions() const override;
+ QList<QAction *> taskActions() const override;
private slots:
void editState();