diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-07 09:30:16 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-11 11:05:15 +0200 |
| commit | 90210c8d28a90295ebbf37ef45b69924ed7f42d0 (patch) | |
| tree | a67feb9140d069197bbcaf53fe28d71e4be255cd /src/widgets/graphicsview | |
| parent | 219e7bafa278792f7bde110d24333fb60b555c12 (diff) | |
Remove dead code from src/widgets
Code that's removed via QT_VERSION(6, 0, 0) check is already no
longer compiled.
Change-Id: I70865f330a6260ac2e9cf2770d599a5b6f7bb7d4
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/widgets/graphicsview')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicswidget.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/graphicsview/qgraphicswidget.h | 5 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index 713763ad0f..530f7aee7a 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -2006,11 +2006,7 @@ void QGraphicsWidget::addAction(QAction *action) \sa removeAction(), QMenu, addAction(), QWidget::addActions() */ -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) void QGraphicsWidget::addActions(const QList<QAction *> &actions) -#else -void QGraphicsWidget::addActions(QList<QAction *> actions) -#endif { for (int i = 0; i < actions.count(); ++i) insertAction(nullptr, actions.at(i)); @@ -2067,11 +2063,7 @@ void QGraphicsWidget::insertAction(QAction *before, QAction *action) \sa removeAction(), QMenu, insertAction(), QWidget::insertActions() */ -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) void QGraphicsWidget::insertActions(QAction *before, const QList<QAction *> &actions) -#else -void QGraphicsWidget::insertActions(QAction *before, QList<QAction *> actions) -#endif { for (int i = 0; i < actions.count(); ++i) insertAction(before, actions.at(i)); diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index 03852d0897..52415e8525 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -148,13 +148,8 @@ public: #ifndef QT_NO_ACTION //actions void addAction(QAction *action); -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) void addActions(const QList<QAction*> &actions); void insertActions(QAction *before, const QList<QAction*> &actions); -#else - void addActions(QList<QAction*> actions); - void insertActions(QAction *before, QList<QAction*> actions); -#endif void insertAction(QAction *before, QAction *action); void removeAction(QAction *action); QList<QAction*> actions() const; |