summaryrefslogtreecommitdiffstats
path: root/src/widgets/styles
diff options
context:
space:
mode:
authorSérgio Martins <sergio.martins@kdab.com>2014-08-11 19:28:23 +0100
committerMarc Mutz <marc.mutz@kdab.com>2014-08-13 08:47:54 +0200
commitbf9a4ef8b4210bd1f434828911361008ea2350ec (patch)
tree1a9c5af5fe1424956da78dea282ff38c7c1c5967 /src/widgets/styles
parentf2c7ea717874664ee4927f500efc244fde585d31 (diff)
Fix QT_NO_ANIMATION build
Change-Id: Ia589e703206d6ca675a392e634e2a445dcf4cca3 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/styles')
-rw-r--r--src/widgets/styles/qcommonstyle.cpp2
-rw-r--r--src/widgets/styles/qcommonstyle.h2
-rw-r--r--src/widgets/styles/qcommonstyle_p.h4
-rw-r--r--src/widgets/styles/qstyleanimation.cpp5
-rw-r--r--src/widgets/styles/qstyleanimation_p.h4
5 files changed, 17 insertions, 0 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index d7030c5d72..27fef46772 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -1136,6 +1136,7 @@ void QCommonStylePrivate::tabLayout(const QStyleOptionTabV3 *opt, const QWidget
}
#endif //QT_NO_TABBAR
+#ifndef QT_NO_ANIMATION
/*! \internal */
QList<const QObject*> QCommonStylePrivate::animationTargets() const
{
@@ -1176,6 +1177,7 @@ void QCommonStylePrivate::_q_removeAnimation()
if (animation)
animations.remove(animation->parent());
}
+#endif
/*!
\reimp
diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h
index 942721a6a3..ef5634a94d 100644
--- a/src/widgets/styles/qcommonstyle.h
+++ b/src/widgets/styles/qcommonstyle.h
@@ -98,7 +98,9 @@ protected:
private:
Q_DECLARE_PRIVATE(QCommonStyle)
Q_DISABLE_COPY(QCommonStyle)
+#ifndef QT_NO_ANIMATION
Q_PRIVATE_SLOT(d_func(), void _q_removeAnimation())
+#endif
};
QT_END_NAMESPACE
diff --git a/src/widgets/styles/qcommonstyle_p.h b/src/widgets/styles/qcommonstyle_p.h
index 8f8a97a2dc..1f5d8b8a81 100644
--- a/src/widgets/styles/qcommonstyle_p.h
+++ b/src/widgets/styles/qcommonstyle_p.h
@@ -77,7 +77,9 @@ public:
~QCommonStylePrivate()
{
+#ifndef QT_NO_ANIMATION
qDeleteAll(animations);
+#endif
#ifndef QT_NO_ITEMVIEWS
delete cachedOption;
#endif
@@ -114,6 +116,7 @@ public:
#endif
int animationFps;
+#ifndef QT_NO_ANIMATION
void _q_removeAnimation();
QList<const QObject*> animationTargets() const;
@@ -123,6 +126,7 @@ public:
private:
mutable QHash<const QObject*, QStyleAnimation*> animations;
+#endif // QT_NO_ANIMATION
};
QT_END_NAMESPACE
diff --git a/src/widgets/styles/qstyleanimation.cpp b/src/widgets/styles/qstyleanimation.cpp
index 85dc357ab5..6668be8307 100644
--- a/src/widgets/styles/qstyleanimation.cpp
+++ b/src/widgets/styles/qstyleanimation.cpp
@@ -40,6 +40,9 @@
****************************************************************************/
#include "qstyleanimation_p.h"
+
+#ifndef QT_NO_ANIMATION
+
#include <qcoreapplication.h>
#include <qwidget.h>
#include <qevent.h>
@@ -344,3 +347,5 @@ void QScrollbarStyleAnimation::updateCurrentTime(int time)
}
QT_END_NAMESPACE
+
+#endif //QT_NO_ANIMATION
diff --git a/src/widgets/styles/qstyleanimation_p.h b/src/widgets/styles/qstyleanimation_p.h
index c344858812..33868a3440 100644
--- a/src/widgets/styles/qstyleanimation_p.h
+++ b/src/widgets/styles/qstyleanimation_p.h
@@ -48,6 +48,8 @@
QT_BEGIN_NAMESPACE
+#ifndef QT_NO_ANIMATION
+
//
// W A R N I N G
// -------------
@@ -184,6 +186,8 @@ private:
bool _active;
};
+#endif // QT_NO_ANIMATION
+
QT_END_NAMESPACE
#endif // QSTYLEANIMATION_P_H