aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/types
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-12-19 16:37:24 +0100
committerUlf Hermann <ulf.hermann@qt.io>2018-02-15 08:04:48 +0000
commit70f35501da4d1bbb36703dcc7b121c454f8d57a9 (patch)
tree5f925444054cccb467ad0a5acdb09b8c31c837e7 /src/qml/types
parentf254b0aa67a4656d25c7ea240efcd00084772f00 (diff)
Add a feature for qml-animation
It should be possible to switch it off without globally switching animations off in Qt. Change-Id: I3cae6b72b2c6b5c420f21625208de5e273839438 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/types')
-rw-r--r--src/qml/types/qqmltimer_p.h2
-rw-r--r--src/qml/types/types.pri2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/types/qqmltimer_p.h b/src/qml/types/qqmltimer_p.h
index 7739dad2a6..c97230501e 100644
--- a/src/qml/types/qqmltimer_p.h
+++ b/src/qml/types/qqmltimer_p.h
@@ -57,6 +57,8 @@
#include <private/qtqmlglobal_p.h>
+QT_REQUIRE_CONFIG(qml_animation);
+
QT_BEGIN_NAMESPACE
class QQmlTimerPrivate;
diff --git a/src/qml/types/types.pri b/src/qml/types/types.pri
index 574e7c214d..25b231f954 100644
--- a/src/qml/types/types.pri
+++ b/src/qml/types/types.pri
@@ -33,7 +33,7 @@ qtConfig(qml-list-model) {
$$PWD/qqmllistmodelworkeragent_p.h
}
-qtConfig(animation) {
+qtConfig(qml-animation) {
SOURCES += \
$$PWD/qqmltimer.cpp