diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-12-19 16:37:24 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-02-15 08:04:48 +0000 |
| commit | 70f35501da4d1bbb36703dcc7b121c454f8d57a9 (patch) | |
| tree | 5f925444054cccb467ad0a5acdb09b8c31c837e7 /tools | |
| parent | f254b0aa67a4656d25c7ea240efcd00084772f00 (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 'tools')
| -rw-r--r-- | tools/qml/main.cpp | 6 | ||||
| -rw-r--r-- | tools/qml/qml.pro | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 83680a5ba1..c8858a44ae 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -55,7 +55,9 @@ #include <QLibraryInfo> #include <qqml.h> #include <qqmldebug.h> -#if QT_CONFIG(animation) + +#include <private/qtqmlglobal_p.h> +#if QT_CONFIG(qml_animation) #include <private/qabstractanimation_p.h> #endif @@ -483,7 +485,7 @@ int main(int argc, char *argv[]) break; else if (arg == QLatin1String("-verbose")) verboseMode = true; -#if QT_CONFIG(animation) +#if QT_CONFIG(qml_animation) else if (arg == QLatin1String("-slow-animations")) QUnifiedTimer::instance()->setSlowModeEnabled(true); else if (arg == QLatin1String("-fixed-animations")) diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 04704f9314..3f41707275 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -1,4 +1,4 @@ -QT = qml core-private +QT = qml-private core-private qtHaveModule(gui): QT += gui qtHaveModule(widgets): QT += widgets |