diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-26 16:08:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-26 16:14:54 +0200 |
| commit | aadfe7d634de04519102c5827ca885dc2e2199c9 (patch) | |
| tree | d92db346ca95332b177036a53f1f6beb2e24fb74 /src/widgets/widgets/qwidgetanimator.cpp | |
| parent | 4b6c1448047362b8c38d265e6414f0e3e59b8d37 (diff) | |
| parent | a732e16d5fd9dbf8a0289fec9f948b12e9ba2c19 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/gui/kernel/qguiapplication.cpp
src/platformsupport/input/libinput/qlibinputpointer.cpp
src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
src/plugins/platforms/cocoa/qcocoawindow.h
src/testlib/qtestsystem.h
Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5
Diffstat (limited to 'src/widgets/widgets/qwidgetanimator.cpp')
| -rw-r--r-- | src/widgets/widgets/qwidgetanimator.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/widgets/qwidgetanimator.cpp b/src/widgets/widgets/qwidgetanimator.cpp index 3a00999e57..b6828a14ef 100644 --- a/src/widgets/widgets/qwidgetanimator.cpp +++ b/src/widgets/widgets/qwidgetanimator.cpp @@ -40,7 +40,9 @@ #include <QtCore/qpropertyanimation.h> #include <QtWidgets/qwidget.h> #include <QtWidgets/qstyle.h> +#if QT_CONFIG(mainwindow) #include <private/qmainwindowlayout_p.h> +#endif #include "qwidgetanimator_p.h" @@ -61,7 +63,7 @@ void QWidgetAnimator::abort(QWidget *w) if (anim) { anim->stop(); } -#ifndef QT_NO_MAINWINDOW +#if QT_CONFIG(mainwindow) m_mainWindowLayout->animationFinished(w); #endif #else @@ -108,9 +110,9 @@ void QWidgetAnimator::animate(QWidget *widget, const QRect &_final_geometry, boo { //we do it in one shot widget->setGeometry(final_geometry); -#ifndef QT_NO_MAINWINDOW +#if QT_CONFIG(mainwindow) m_mainWindowLayout->animationFinished(widget); -#endif //QT_NO_MAINWINDOW +#endif // QT_CONFIG(mainwindow) } } |