diff options
| author | Nick Shaforostov <mshaforostov@airmusictech.com> | 2019-05-03 12:30:49 +0200 |
|---|---|---|
| committer | Nick Shaforostov <mshaforostov@airmusictech.com> | 2019-05-05 09:14:48 +0000 |
| commit | 4d5fb551d6bcf32d74459ab378c231914c48ab10 (patch) | |
| tree | 6feeceaacad8bfea6e2c40e3a643941e665bfda6 /src/widgets | |
| parent | 835c3e94f6089751421a19008d442faec9649ed8 (diff) | |
fix compilation with various -no-feature-* options
Change-Id: Ic1975db497613e3efe50be4246c167efe10d8e31
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
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 9508aed3d3..50668b3251 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.cpp +++ b/src/widgets/itemviews/qabstractitemdelegate.cpp @@ -386,6 +386,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 |