diff options
Diffstat (limited to 'tools/qml/main.cpp')
-rw-r--r-- | tools/qml/main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 1699d3d81b..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 @@ -567,7 +571,7 @@ int main(int argc, char *argv[]) loadDummyDataFiles(e, dummyDir); for (const QString &path : qAsConst(files)) { - QUrl url = QUrl::fromUserInput(path, QDir::currentPath()); + QUrl url = QUrl::fromUserInput(path, QDir::currentPath(), QUrl::AssumeLocalFile); if (verboseMode) printf("qml: loading %s\n", qPrintable(url.toString())); QByteArray strippedFile; |