diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-07 14:48:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-07 12:53:23 +0000 |
| commit | 017350a8a9b4ac866c9b79186bf5a1dd6f6f06ec (patch) | |
| tree | f98070d9bf0bd5659d34355b5eb9647637874187 /tools/qml | |
| parent | b361a59c699fca02379c149cf0b9c59490a1ba62 (diff) | |
| parent | 67d1d7843ab5e1c904c8f0f76eadb9fc3f1bbb17 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/qml/jit/qv4assembler.cpp
src/qml/jit/qv4assembler_p.h
src/qml/jit/qv4isel_masm.cpp
src/qml/jsruntime/qv4vme_moth.cpp
Change-Id: I865d794e550a263387a39ca8d051ebf48b70cbc0
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 53dd35da07..3b20fba5d4 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 |