aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qml
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@qt.io>2017-03-30 17:41:52 +0900
committerTasuku Suzuki <tasuku.suzuki@qt.io>2017-04-03 00:27:29 +0000
commite76ffb62a2ee3eb14c9bfc61244deae4bb761f8f (patch)
tree486462087162fdef2a4ecb2dc0ee6b4800d7b458 /tools/qml
parentf261a534cc96d41cee15462795844116887bd99a (diff)
Fix build without features.animation
Change-Id: Ie45a2f01def64941a323973ea27446e3fc85a72b Reviewed-by: Robin Burchell <robin.burchell@crimson.no> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tools/qml')
-rw-r--r--tools/qml/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 8af9a1de41..03d952ee98 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/qabstractanimation_p.h>
+#endif
#include <cstdio>
#include <cstring>
@@ -476,10 +478,12 @@ int main(int argc, char *argv[])
break;
else if (arg == QLatin1String("-verbose"))
verboseMode = true;
+#if QT_CONFIG(animation)
else if (arg == QLatin1String("-slow-animations"))
QUnifiedTimer::instance()->setSlowModeEnabled(true);
else if (arg == QLatin1String("-fixed-animations"))
QUnifiedTimer::instance()->setConsistentTiming(true);
+#endif
else if (arg == QLatin1String("-I")) {
if (i+1 == argList.count())
continue;//Invalid usage, but just ignore it