diff options
author | Sérgio Martins <sergio.martins@kdab.com> | 2014-08-11 19:28:23 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2014-08-13 08:47:54 +0200 |
commit | bf9a4ef8b4210bd1f434828911361008ea2350ec (patch) | |
tree | 1a9c5af5fe1424956da78dea282ff38c7c1c5967 /src/widgets/widgets | |
parent | f2c7ea717874664ee4927f500efc244fde585d31 (diff) |
Fix QT_NO_ANIMATION build
Change-Id: Ia589e703206d6ca675a392e634e2a445dcf4cca3
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qlineedit_p.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qlineedit_p.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index d19fe43eb2..a4394ae92b 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -337,6 +337,7 @@ void QLineEditIconButton::setOpacity(qreal value) } } +#ifndef QT_NO_ANIMATION void QLineEditIconButton::startOpacityAnimation(qreal endValue) { QPropertyAnimation *animation = new QPropertyAnimation(this, QByteArrayLiteral("opacity")); @@ -344,6 +345,7 @@ void QLineEditIconButton::startOpacityAnimation(qreal endValue) animation->setEndValue(endValue); animation->start(QAbstractAnimation::DeleteWhenStopped); } +#endif void QLineEditIconButton::updateCursor() { @@ -358,6 +360,7 @@ void QLineEditPrivate::_q_textChanged(const QString &text) const int newTextSize = text.size(); if (!newTextSize || !lastTextSize) { lastTextSize = newTextSize; +#ifndef QT_NO_ANIMATION const bool fadeIn = newTextSize > 0; foreach (const SideWidgetEntry &e, leadingSideWidgets) { if (e.flags & SideWidgetFadeInWithText) @@ -367,6 +370,7 @@ void QLineEditPrivate::_q_textChanged(const QString &text) if (e.flags & SideWidgetFadeInWithText) static_cast<QLineEditIconButton *>(e.widget)->animateShow(fadeIn); } +#endif } } } diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index db8edee005..7749d9902a 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -84,7 +84,9 @@ public: qreal opacity() const { return m_opacity; } void setOpacity(qreal value); +#ifndef QT_NO_ANIMATION void animateShow(bool visible) { startOpacityAnimation(visible ? 1.0 : 0.0); } +#endif protected: void paintEvent(QPaintEvent *event); @@ -93,7 +95,9 @@ private slots: void updateCursor(); private: +#ifndef QT_NO_ANIMATION void startOpacityAnimation(qreal endValue); +#endif qreal m_opacity; }; |