/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
**
** This file is part of the tools applications of the Qt Toolkit.
**
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtGui/QGuiApplication>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/qdeclarativecontext.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcomponent.h>
+#include <QtQml/qqmlcontext.h>
#include <QtQuick/qquickitem.h>
#include <QtQuick/qquickview.h>
+#include <private/qabstractanimation_p.h>
+
#ifdef QT_WIDGETS_LIB
#include <QtWidgets/QApplication>
#include <QtWidgets/QFileDialog>
}
#endif
-class MyQQuickView : public QQuickView
-{
-public:
- MyQQuickView() : QQuickView()
- {
- setResizeMode(QQuickView::SizeRootObjectToView);
- }
-};
-
struct Options
{
Options()
, fullscreen(false)
, clip(false)
, versionDetection(true)
+ , slowAnimations(false)
+ , quitImmediately(false)
+ , resizeViewToRootItem(false)
{
}
bool scenegraphOnGraphicsview;
bool clip;
bool versionDetection;
+ bool slowAnimations;
+ bool quitImmediately;
+ bool resizeViewToRootItem;
};
#if defined(QMLSCENE_BUNDLE)
}
#endif
-static void checkAndAdaptVersion(const QUrl &url)
+static bool checkVersion(const QUrl &url)
{
if (!qgetenv("QMLSCENE_IMPORT_NAME").isEmpty()) {
- return;
+ qWarning("QMLSCENE_IMPORT_NAME is no longer supported.");
}
QString fileName = url.toLocalFile();
- if (fileName.isEmpty())
- return;
+ if (fileName.isEmpty()) {
+ qWarning("qmlscene: filename required.");
+ return false;
+ }
QFile f(fileName);
if (!f.open(QFile::ReadOnly | QFile::Text)) {
qWarning("qmlscene: failed to check version of file '%s', could not open...",
qPrintable(fileName));
- return;
+ return false;
}
- QRegExp quick1("^\\s*import +QtQuick +1\\.");
- QRegExp quick2("^\\s*import +QtQuick +2\\.");
+ QRegExp quick1("^\\s*import +QtQuick +1\\.\\w*");
QRegExp qt47("^\\s*import +Qt +4\\.7");
- QString envToWrite;
- QString compat;
-
QTextStream stream(&f);
bool codeFound= false;
while (!codeFound) {
QString line = stream.readLine();
- if (line.contains("{"))
+ if (line.contains("{")) {
codeFound = true;
- if (envToWrite.isEmpty() && quick1.indexIn(line) >= 0) {
- envToWrite = QLatin1String("quick1");
- compat = QLatin1String("QtQuick 1.0");
- } else if (envToWrite.isEmpty() && qt47.indexIn(line) >= 0) {
- envToWrite = QLatin1String("qt");
- compat = QLatin1String("Qt 4.7");
- } else if (quick2.indexIn(line) >= 0) {
- envToWrite.clear();
- compat.clear();
- break;
+ } else {
+ QString import;
+ if (quick1.indexIn(line) >= 0) {
+ import = quick1.cap(0).trimmed();
+ } else if (qt47.indexIn(line) >= 0) {
+ import = qt47.cap(0).trimmed();
+ }
+
+ if (!import.isNull()) {
+ qWarning("qmlscene: '%s' is no longer supported.\n"
+ "Use qmlviewer to load file '%s'.",
+ qPrintable(import),
+ qPrintable(fileName));
+ return false;
+ }
}
}
- if (!envToWrite.isEmpty()) {
- qWarning("qmlscene: Autodetecting compatibility import \"%s\"...", qPrintable(compat));
- if (qgetenv("QMLSCENE_IMPORT_NAME").isEmpty())
- qputenv("QMLSCENE_IMPORT_NAME", envToWrite.toLatin1().constData());
- }
+ return true;
}
static void displayFileDialog(Options *options)
{
-#ifdef QT_WIDGETS_LIB
+#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_FILEDIALOG)
QString fileName = QFileDialog::getOpenFileName(0, "Open QML file", QString(), "QML Files (*.qml)");
if (!fileName.isEmpty()) {
QFileInfo fi(fileName);
#endif
}
-static void loadDummyDataFiles(QDeclarativeEngine &engine, const QString& directory)
+static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory)
{
QDir dir(directory+"/dummydata", "*.qml");
QStringList list = dir.entryList();
QFile f(dir.filePath(qml));
f.open(QIODevice::ReadOnly);
QByteArray data = f.readAll();
- QDeclarativeComponent comp(&engine);
+ QQmlComponent comp(&engine);
comp.setData(data, QUrl());
QObject *dummyData = comp.create();
if(comp.isError()) {
- QList<QDeclarativeError> errors = comp.errors();
- foreach (const QDeclarativeError &error, errors) {
+ QList<QQmlError> errors = comp.errors();
+ foreach (const QQmlError &error, errors) {
qWarning() << error;
}
}
qWarning(" --fullscreen .............................. run fullscreen");
qWarning(" --no-multisample .......................... Disable multisampling (anti-aliasing)");
qWarning(" --no-version-detection .................... Do not try to detect the version of the .qml file");
+ qWarning(" --slow-animations ......................... Run all animations in slow motion");
+ qWarning(" --resize-to-root .......................... Resize the window to the size of the root item");
+ qWarning(" --quit .................................... Quit immediately after starting");
+ qWarning(" -I <path> ................................. Add <path> to the list of import paths");
+ qWarning(" -B <name> <file> .......................... Add a named bundle");
qWarning(" ");
exit(1);
Options options;
QStringList imports;
+ QList<QPair<QString, QString> > bundles;
for (int i = 1; i < argc; ++i) {
if (*argv[i] != '-' && QFileInfo(QFile::decodeName(argv[i])).exists()) {
options.file = QUrl::fromLocalFile(argv[i]);
options.clip = true;
else if (lowerArgument == QLatin1String("--no-version-detection"))
options.versionDetection = false;
+ else if (lowerArgument == QLatin1String("--slow-animations"))
+ options.slowAnimations = true;
+ else if (lowerArgument == QLatin1String("--quit"))
+ options.quitImmediately = true;
+ else if (lowerArgument == QLatin1String("--resize-to-root"))
+ options.resizeViewToRootItem = true;
else if (lowerArgument == QLatin1String("-i") && i + 1 < argc)
imports.append(QString::fromLatin1(argv[++i]));
- else if (lowerArgument == QLatin1String("--help")
+ else if (lowerArgument == QLatin1String("-b") && i + 2 < argc) {
+ QString name = QString::fromLatin1(argv[++i]);
+ QString file = QString::fromLatin1(argv[++i]);
+ bundles.append(qMakePair(name, file));
+ } else if (lowerArgument == QLatin1String("--help")
|| lowerArgument == QLatin1String("-help")
|| lowerArgument == QLatin1String("--h")
|| lowerArgument == QLatin1String("-h"))
app.setOrganizationName("Nokia");
app.setOrganizationDomain("nokia.com");
+ QUnifiedTimer::instance()->setSlowModeEnabled(options.slowAnimations);
+
if (options.file.isEmpty())
#if defined(QMLSCENE_BUNDLE)
displayOptionsDialog(&options);
#endif
QWindow *window = 0;
- QDeclarativeEngine *engine = 0;
+ QQmlEngine *engine = 0;
int exitCode = 0;
if (!options.file.isEmpty()) {
- if (options.versionDetection)
- checkAndAdaptVersion(options.file);
- QQuickView *qxView = new MyQQuickView();
- engine = qxView->engine();
- for (int i = 0; i < imports.size(); ++i)
- engine->addImportPath(imports.at(i));
- window = qxView;
- if (options.file.isLocalFile()) {
- QFileInfo fi(options.file.toLocalFile());
- loadDummyDataFiles(*engine, fi.path());
- }
- qxView->setSource(options.file);
+ if (!options.versionDetection || checkVersion(options.file)) {
+ QQuickView *qxView = new QQuickView();
+ engine = qxView->engine();
+ for (int i = 0; i < imports.size(); ++i)
+ engine->addImportPath(imports.at(i));
+ for (int i = 0; i < bundles.size(); ++i)
+ engine->addNamedBundle(bundles.at(i).first, bundles.at(i).second);
+ window = qxView;
+ if (options.file.isLocalFile()) {
+ QFileInfo fi(options.file.toLocalFile());
+ loadDummyDataFiles(*engine, fi.path());
+ }
+ qxView->setSource(options.file);
- QObject::connect(engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
+ QObject::connect(engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
- window->setWindowFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
- if (options.fullscreen)
- window->showFullScreen();
- else if (options.maximized)
- window->showMaximized();
- else
- window->show();
+ if (options.resizeViewToRootItem)
+ qxView->setResizeMode(QQuickView::SizeViewToRootObject);
+ else
+ qxView->setResizeMode(QQuickView::SizeRootObjectToView);
+
+ window->setWindowFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
+ if (options.fullscreen)
+ window->showFullScreen();
+ else if (options.maximized)
+ window->showMaximized();
+ else
+ window->show();
- exitCode = app.exec();
+ if (options.quitImmediately) {
+ QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection);
+ }
+
+ exitCode = app.exec();
- delete window;
+ delete window;
#ifdef QML_RUNTIME_TESTING
- RenderStatistics::printTotalStats();
+ RenderStatistics::printTotalStats();
#endif
+ }
}
return exitCode;