#include <private/qqmlengine_p.h>
#include <QtCore/qbasictimer.h>
-
QT_BEGIN_NAMESPACE
-void QQuickViewPrivate::init()
+void QQuickViewPrivate::init(QQmlEngine* e)
{
Q_Q(QQuickView);
- engine.setIncubationController(q->incubationController());
+ engine = e;
+
+ if (engine.isNull())
+ engine = new QQmlEngine(q);
+
+ if (!engine.data()->incubationController())
+ engine.data()->setIncubationController(q->incubationController());
if (QQmlDebugService::isDebuggingEnabled())
QQmlInspectorService::instance()->addView(q);
void QQuickViewPrivate::execute()
{
Q_Q(QQuickView);
+ if (!engine) {
+ qWarning() << "QQuickView: invalid qml engine.";
+ return;
+ }
+
if (root) {
delete root;
root = 0;
component = 0;
}
if (!source.isEmpty()) {
- QML_MEMORY_SCOPE_URL(engine.baseUrl().resolved(source));
- component = new QQmlComponent(&engine, source, q);
+ QML_MEMORY_SCOPE_URL(engine.data()->baseUrl().resolved(source));
+ component = new QQmlComponent(engine.data(), source, q);
if (!component->isLoading()) {
q->continueExecute();
} else {
*/
/*!
- \fn QQuickView::QQuickView(QWindow *parent)
+ \fn QQuickView::QQuickView(QWindow *parent, Qt::WindowFlags f)
- Constructs a QQuickView with the given \a parent.
+ Constructs a QQuickView with the given \a parent and window flags \a f.
+ The default value of \a parent is 0, default window flags \a f is Qt::Window.
+
+ \sa Qt::WindowFlags
*/
QQuickView::QQuickView(QWindow *parent, Qt::WindowFlags f)
: QQuickCanvas(*(new QQuickViewPrivate), parent)
}
/*!
- \fn QQuickView::QQuickView(const QUrl &source, QWidget *parent)
+ \fn QQuickView::QQuickView(const QUrl &source, QWidget *parent, Qt::WindowFlags f)
+
+ Constructs a QQuickView with the given QML \a source, \a parent and a window flags \a f.
+ The default value of \a parent is 0, default window flags \a f is Qt::Window.
- Constructs a QQuickView with the given QML \a source and \a parent.
+ \sa Qt::WindowFlags
*/
QQuickView::QQuickView(const QUrl &source, QWindow *parent, Qt::WindowFlags f)
: QQuickCanvas(*(new QQuickViewPrivate), parent)
setSource(source);
}
+/*!
+ \fn QQuickView::QQuickView(QQmlEngine* engine, QWindow *parent, Qt::WindowFlags f)
+
+ Constructs a QQuickView with the given QML \a engine, \a parent and a window flags \a f.
+ The default value of \a parent is 0, default window flags \a f is Qt::Window.
+
+ Note: In this case, the QQuickView does not own the given \a engine object;
+ it is the caller's responsibility to destroy the engine. If the \a engine is deleted
+ before the view \a status() will return \a QQuickView::Error.
+
+ \sa Status, status(), errors(), Qt::WindowFlags
+*/
+QQuickView::QQuickView(QQmlEngine* engine, QWindow *parent, Qt::WindowFlags f)
+ : QQuickCanvas(*(new QQuickViewPrivate), parent)
+{
+ Q_ASSERT(engine);
+ setWindowFlags(f);
+ d_func()->init(engine);
+}
+
QQuickView::~QQuickView()
{
}
QQmlEngine* QQuickView::engine() const
{
Q_D(const QQuickView);
- return const_cast<QQmlEngine *>(&d->engine);
+ return d->engine ? const_cast<QQmlEngine *>(d->engine.data()) : 0;
}
/*!
QQmlContext* QQuickView::rootContext() const
{
Q_D(const QQuickView);
- return d->engine.rootContext();
+ return d->engine ? d->engine.data()->rootContext() : 0;
}
/*!
QQuickView::Status QQuickView::status() const
{
Q_D(const QQuickView);
+ if (!d->engine)
+ return QQuickView::Error;
+
if (!d->component)
return QQuickView::Null;
QList<QQmlError> QQuickView::errors() const
{
Q_D(const QQuickView);
+ QList<QQmlError> errs;
+
if (d->component)
- return d->component->errors();
- return QList<QQmlError>();
+ errs = d->component->errors();
+
+ if (!d->engine) {
+ QQmlError error;
+ error.setDescription(QLatin1String("QQuickView: invalid qml engine."));
+ errs << error;
+ }
+
+ return errs;
}
/*!
#include "../../shared/util.h"
#include <QtGui/QWindow>
#include <QtCore/QDebug>
+#include <QtQml/qqmlengine.h>
class tst_QQuickView : public QQmlDataTest
{
private slots:
void resizemodeitem();
void errors();
+ void engine();
};
delete canvas;
}
+void tst_QQuickView::engine()
+{
+ QQmlEngine *engine = new QQmlEngine;
+ QVERIFY(!engine->incubationController());
+
+ QQuickView *canvas = new QQuickView(engine, 0);
+ QVERIFY(canvas);
+ QVERIFY(engine->incubationController() == canvas->incubationController());
+
+ QQuickView *canvas2 = new QQuickView(engine, 0);
+ QVERIFY(canvas);
+ QVERIFY(engine->incubationController() == canvas->incubationController());
+ delete canvas;
+ QVERIFY(!engine->incubationController());
+
+ engine->setIncubationController(canvas2->incubationController());
+ QVERIFY(engine->incubationController() == canvas2->incubationController());
+ delete canvas2;
+ QVERIFY(!engine->incubationController());
+
+ QQuickView *canvas3 = new QQuickView;
+ QQuickView *canvas4 = new QQuickView(canvas3->engine(), 0);
+
+ QVERIFY(canvas3->engine());
+ QVERIFY(canvas4->engine());
+ QCOMPARE(canvas3->engine(), canvas4->engine());
+ delete canvas3;
+ QVERIFY(!canvas4->engine());
+ QTest::ignoreMessage(QtWarningMsg, "QQuickView: invalid qml engine. ");
+ canvas4->setSource(QUrl());
+
+ QCOMPARE(canvas4->status(), QQuickView::Error);
+ QVERIFY(!canvas4->errors().isEmpty());
+ QCOMPARE(canvas4->errors().back().description(), QLatin1String("QQuickView: invalid qml engine."));
+ delete canvas4;
+}
QTEST_MAIN(tst_QQuickView)