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/kernel/qwidget.h | |
| 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/kernel/qwidget.h')
| -rw-r--r-- | src/widgets/kernel/qwidget.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index d13e273292..0d2c2913f9 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -551,13 +551,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; @@ -648,11 +643,7 @@ protected: virtual void showEvent(QShowEvent *event); virtual void hideEvent(QHideEvent *event); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) virtual bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result); -#else - virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result); -#endif // Misc. protected functions virtual void changeEvent(QEvent *); |