diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-06 01:00:13 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-06 01:00:13 +0200 |
commit | e4e5a1f0b7f85b4c8b593a06a67d83f5be09004e (patch) | |
tree | dac64fe28e21f02938be5c726002b379750fe7ad /src/widgets | |
parent | 615b02bfa2fb861f362c511087e6962660c25ea3 (diff) | |
parent | a50b29d65bddae44aedfd9372502f656656803d5 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iaad9509712c848ed42ada2c25065162a6fc5a930
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/itemviews/qabstractitemdelegate.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qwidgetanimator.cpp | 6 | ||||
-rw-r--r-- | src/widgets/widgets/qwidgetanimator_p.h | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/widgets/itemviews/qabstractitemdelegate.cpp b/src/widgets/itemviews/qabstractitemdelegate.cpp index 448e775a71..31dde8832b 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.cpp +++ b/src/widgets/itemviews/qabstractitemdelegate.cpp @@ -388,6 +388,8 @@ bool QAbstractItemDelegate::helpEvent(QHelpEvent *event, const QModelIndex &index) { Q_D(QAbstractItemDelegate); + Q_UNUSED(d); + Q_UNUSED(index); Q_UNUSED(option); if (!event || !view) diff --git a/src/widgets/widgets/qwidgetanimator.cpp b/src/widgets/widgets/qwidgetanimator.cpp index b1e527e3b6..486d65d92c 100644 --- a/src/widgets/widgets/qwidgetanimator.cpp +++ b/src/widgets/widgets/qwidgetanimator.cpp @@ -50,8 +50,12 @@ QT_BEGIN_NAMESPACE -QWidgetAnimator::QWidgetAnimator(QMainWindowLayout *layout) : m_mainWindowLayout(layout) +QWidgetAnimator::QWidgetAnimator(QMainWindowLayout *layout) +#if QT_CONFIG(mainwindow) +: m_mainWindowLayout(layout) +#endif { + Q_UNUSED(layout) } void QWidgetAnimator::abort(QWidget *w) diff --git a/src/widgets/widgets/qwidgetanimator_p.h b/src/widgets/widgets/qwidgetanimator_p.h index 920cc3ffc8..9d08d03593 100644 --- a/src/widgets/widgets/qwidgetanimator_p.h +++ b/src/widgets/widgets/qwidgetanimator_p.h @@ -81,7 +81,9 @@ private Q_SLOTS: private: typedef QHash<QWidget*, QPointer<QPropertyAnimation> > AnimationMap; AnimationMap m_animation_map; +#if QT_CONFIG(mainwindow) QMainWindowLayout *m_mainWindowLayout; +#endif }; QT_END_NAMESPACE |