summaryrefslogtreecommitdiffstats
path: root/examples/widgets
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-10-17 10:35:28 +0200
committerLiang Qi <liang.qi@qt.io>2018-10-17 10:35:28 +0200
commitccf26f6a88e116abdf8e53acdc02dbd98a4a8dc4 (patch)
tree40aaca99471edc709d38e6f82153576bad86747f /examples/widgets
parent8ff1ae89bfa32c586e3b44b71dfc49d294a3e043 (diff)
parent3eebadc1734463afa469dcd08eab8c5d2557dec6 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts: src/plugins/platformthemes/platformthemes.pro src/printsupport/kernel/qplatformprintdevice.cpp Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6
Diffstat (limited to 'examples/widgets')
-rw-r--r--examples/widgets/animation/sub-attaq/qanimationstate.cpp5
-rw-r--r--examples/widgets/animation/sub-attaq/qanimationstate.h5
-rw-r--r--examples/widgets/widgets.pro1
3 files changed, 1 insertions, 10 deletions
diff --git a/examples/widgets/animation/sub-attaq/qanimationstate.cpp b/examples/widgets/animation/sub-attaq/qanimationstate.cpp
index 82bfdbf4b9..ae24af6da3 100644
--- a/examples/widgets/animation/sub-attaq/qanimationstate.cpp
+++ b/examples/widgets/animation/sub-attaq/qanimationstate.cpp
@@ -80,9 +80,6 @@ machine.start();
\sa QState, {The Animation Framework}
*/
-
-#ifndef QT_NO_ANIMATION
-
/*!
Constructs a new state with the given \a parent state.
*/
@@ -155,5 +152,3 @@ bool QAnimationState::event(QEvent *e)
}
QT_END_NAMESPACE
-
-#endif
diff --git a/examples/widgets/animation/sub-attaq/qanimationstate.h b/examples/widgets/animation/sub-attaq/qanimationstate.h
index 06ab4dfbcf..063b119058 100644
--- a/examples/widgets/animation/sub-attaq/qanimationstate.h
+++ b/examples/widgets/animation/sub-attaq/qanimationstate.h
@@ -61,9 +61,6 @@
QT_BEGIN_NAMESPACE
-
-#ifndef QT_NO_ANIMATION
-
class QAbstractAnimation;
class QAnimationState : public QState
@@ -89,8 +86,6 @@ private:
QAbstractAnimation *m_animation;
};
-#endif
-
QT_END_NAMESPACE
#endif // QANIMATIONSTATE_H
diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro
index 8bd85bfe6b..d975ea8307 100644
--- a/examples/widgets/widgets.pro
+++ b/examples/widgets/widgets.pro
@@ -28,4 +28,5 @@ qtHaveModule(gui):qtConfig(opengl): \
contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
!qtConfig(draganddrop): SUBDIRS -= draganddrop
+!qtConfig(animation): SUBDIRS -= animation
mac:SUBDIRS += mac