/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
**
** This file is part of the tools applications of the Qt Toolkit.
**
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtCore/qdebug.h>
#include <QtCore/qabstractanimation.h>
-#include <QtWidgets/qapplication.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qmath.h>
+#include <QtCore/qdatetime.h>
+
+#include <QtGui/QGuiApplication>
+
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativeengine.h>
#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtQuick1/qdeclarativeview.h>
-#include <QtCore/qdir.h>
-#include <QtWidgets/QFormLayout>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QDialog>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QGraphicsView>
-
#include <QtDeclarative/qdeclarativecontext.h>
-// ### This should be private API
-#include <qsgitem.h>
-#include <qsgview.h>
+#include <QtQuick/qquickitem.h>
+#include <QtQuick/qquickview.h>
-#define QT_NO_SCENEGRAPHITEM
+#include <private/qabstractanimation_p.h>
-#ifndef QT_NO_SCENEGRAPHITEM
-#include "scenegraphitem.h"
+#ifdef QT_WIDGETS_LIB
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QFileDialog>
#endif
-#include <QtCore/qmath.h>
#ifdef QML_RUNTIME_TESTING
class RenderStatistics
}
#endif
-class MyQSGView : public QSGView
+class MyQQuickView : public QQuickView
{
public:
- MyQSGView() : QSGView()
+ MyQQuickView() : QQuickView()
{
- setResizeMode(QSGView::SizeRootObjectToView);
- }
-};
-
-class MyDeclarativeView: public QDeclarativeView
-{
-public:
- MyDeclarativeView(QWidget *parent = 0) : QDeclarativeView(parent)
- {
- setResizeMode(QDeclarativeView::SizeRootObjectToView);
- }
-};
-
-#ifndef QT_NO_SCENEGRAPHITEM
-class MyGraphicsView: public QGraphicsView
-{
-public:
- MyGraphicsView(bool clip, QWidget *parent = 0) : QGraphicsView(parent)
- {
- setViewport(new QGLWidget(getFormat()));
- setScene(&scene);
- scene.addItem(&item);
- item.setFlag(QGraphicsItem::ItemClipsToShape, clip);
- QGraphicsTextItem *text;
- text = scene.addText(QLatin1String("Scene graph on graphics view."), QFont(QLatin1String("Times"), 10));
- text->setX(5);
- text->setY(5);
- text->setDefaultTextColor(Qt::black);
- text = scene.addText(QLatin1String("Scene graph on graphics view."), QFont(QLatin1String("Times"), 10));
- text->setX(4);
- text->setY(4);
- text->setDefaultTextColor(Qt::yellow);
- }
-
- SceneGraphItem *sceneGraphItem() { return &item; }
-
-protected:
- void paintEvent(QPaintEvent *event)
- {
- QGraphicsView::paintEvent(event);
-
-#ifdef QML_RUNTIME_TESTING
- RenderStatistics::updateStats();
-#endif
-
- static bool continuousUpdate = qApp->arguments().contains("--continuous-update");
- if (continuousUpdate)
- QGraphicsView::scene()->update();
+ setResizeMode(QQuickView::SizeRootObjectToView);
}
-
- QGraphicsScene scene;
- SceneGraphItem item;
};
-#endif
struct Options
{
, originalQmlRaster(false)
, maximized(false)
, fullscreen(false)
- , scenegraphOnGraphicsview(false)
, clip(false)
, versionDetection(true)
- , vsync(true)
+ , slowAnimations(false)
{
}
bool scenegraphOnGraphicsview;
bool clip;
bool versionDetection;
- bool vsync;
+ bool slowAnimations;
};
#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
QString fileName = QFileDialog::getOpenFileName(0, "Open QML file", QString(), "QML Files (*.qml)");
if (!fileName.isEmpty()) {
QFileInfo fi(fileName);
options->file = QUrl::fromLocalFile(fi.canonicalFilePath());
}
+#else
+ Q_UNUSED(options);
+ qWarning("No filename specified...");
+#endif
}
static void loadDummyDataFiles(QDeclarativeEngine &engine, const QString& directory)
qWarning(" options:");
qWarning(" --maximized ............................... run maximized");
qWarning(" --fullscreen .............................. run fullscreen");
- qWarning(" --original-qml ............................ run using QGraphicsView instead of scenegraph (OpenGL engine)");
- qWarning(" --original-qml-raster ..................... run using QGraphicsView instead of scenegraph (Raster engine)");
qWarning(" --no-multisample .......................... Disable multisampling (anti-aliasing)");
- qWarning(" --continuous-update ....................... Continuously render the scene");
- qWarning(" --nonblocking-swap ........................ Do not wait for v-sync to swap buffers");
- qWarning(" --stereo .................................. Enable stereo on the GL context");
-#ifndef QT_NO_SCENEGRAPHITEM
- qWarning(" --sg-on-gv [--clip] ....................... Scenegraph on graphicsview (and clip to item)");
-#endif
qWarning(" --no-version-detection .................... Do not try to detect the version of the .qml file");
- qWarning(" --no-vsync-animations ..................... Do not use vsync based animations");
+ qWarning(" --slow-animations ......................... Run all animations in slow motion");
qWarning(" ");
exit(1);
int main(int argc, char ** argv)
{
-#ifdef Q_WS_X11
- QApplication::setAttribute(Qt::AA_X11InitThreads);
-#endif
-
Options options;
QStringList imports;
for (int i = 1; i < argc; ++i) {
- if (*argv[i] != '-' && QFileInfo(argv[i]).exists())
+ if (*argv[i] != '-' && QFileInfo(QFile::decodeName(argv[i])).exists()) {
options.file = QUrl::fromLocalFile(argv[i]);
- else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--original-qml"))
- options.originalQml = true;
- else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--original-qml-raster"))
- options.originalQmlRaster = true;
- else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--maximized"))
- options.maximized = true;
- else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--fullscreen"))
- options.fullscreen = true;
- else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--sg-on-gv"))
- options.scenegraphOnGraphicsview = true;
- else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--clip"))
- options.clip = true;
- else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--no-version-detection"))
- options.versionDetection = false;
- else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("-i") && i + 1 < argc)
- imports.append(QString::fromLatin1(argv[++i]));
- else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--no-vsync-animations"))
- options.vsync = false;
- else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--help")
- || QString::fromLatin1(argv[i]).toLower() == QLatin1String("-help")
- || QString::fromLatin1(argv[i]).toLower() == QLatin1String("--h")
- || QString::fromLatin1(argv[i]).toLower() == QLatin1String("-h"))
- usage();
+ } else {
+ const QString lowerArgument = QString::fromLatin1(argv[i]).toLower();
+ if (lowerArgument == QLatin1String("--maximized"))
+ options.maximized = true;
+ else if (lowerArgument == QLatin1String("--fullscreen"))
+ options.fullscreen = true;
+ else if (lowerArgument == QLatin1String("--clip"))
+ 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("-i") && i + 1 < argc)
+ imports.append(QString::fromLatin1(argv[++i]));
+ else if (lowerArgument == QLatin1String("--help")
+ || lowerArgument == QLatin1String("-help")
+ || lowerArgument == QLatin1String("--h")
+ || lowerArgument == QLatin1String("-h"))
+ usage();
+ }
}
- QApplication::setGraphicsSystem("raster");
-
+#ifdef QT_WIDGETS_LIB
QApplication app(argc, argv);
+#else
+ QGuiApplication app(argc, argv);
+#endif
app.setApplicationName("QtQmlViewer");
app.setOrganizationName("Nokia");
app.setOrganizationDomain("nokia.com");
+ QUnifiedTimer::instance()->setSlowModeEnabled(options.slowAnimations);
+
if (options.file.isEmpty())
#if defined(QMLSCENE_BUNDLE)
displayOptionsDialog(&options);
int exitCode = 0;
if (!options.file.isEmpty()) {
-#ifndef QT_NO_SCENEGRAPHITEM
- if (options.scenegraphOnGraphicsview) {
- MyGraphicsView *gvView = new MyGraphicsView(options.clip);
- SceneGraphItem *item = gvView->sceneGraphItem();
- engine = item->engine();
+ if (!options.versionDetection || checkVersion(options.file)) {
+ QQuickView *qxView = new MyQQuickView();
+ engine = qxView->engine();
for (int i = 0; i < imports.size(); ++i)
engine->addImportPath(imports.at(i));
- view = gvView;
+ window = qxView;
if (options.file.isLocalFile()) {
QFileInfo fi(options.file.toLocalFile());
loadDummyDataFiles(*engine, fi.path());
}
- item->setSource(options.file);
- } else
-#endif
- if (options.versionDetection)
- checkAndAdaptVersion(options.file);
- QSGView *qxView = new MyQSGView();
- qxView->setVSyncAnimations(options.vsync);
- 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);
+ qxView->setSource(options.file);
- QObject::connect(engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
+ QObject::connect(engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
- if (options.fullscreen)
- window->showFullScreen();
- else if (options.maximized)
- window->showMaximized();
- else
- window->show();
+ 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();
-#ifdef Q_WS_MAC
- window->raise();
-#endif
-
- exitCode = app.exec();
-
- delete window;
+ delete window;
#ifdef QML_RUNTIME_TESTING
- RenderStatistics::printTotalStats();
+ RenderStatistics::printTotalStats();
#endif
+ }
}
return exitCode;