FCL/sf/mw/qt: comparison src/declarative/qml/qdeclarativecomponent.cpp

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 #include "qdeclarativeengine.h"
 #include "private/qdeclarativebinding_p.h"
 #include "private/qdeclarativebinding_p_p.h"
 #include "private/qdeclarativeglobal_p.h"
 #include "private/qdeclarativescriptparser_p.h"
+#include "private/qdeclarativedebugtrace_p.h"
 #include <QStack>
 #include <QStringList>
 #include <QFileInfo>
 #include <QtCore/qdebug.h>
 #include <QApplication>
-#include <QGraphicsObject>
 QT_BEGIN_NAMESPACE
 class QByteArray;
 /*!
 \class QDeclarativeComponent
 \since 4.7
-\brief The QDeclarativeComponent class encapsulates a QML component description.
+\brief The QDeclarativeComponent class encapsulates a QML component definition.
 \mainclass
+Components are reusable, encapsulated QML elements with well-defined interfaces.
+They are often defined in \l {qdeclarativedocuments.html}{Component Files}.
+A QDeclarativeComponent instance can be created from a QML file.
+For example, if there is a \c main.qml file like this:
+\qml
+import Qt 4.7
+Item {
+width: 200
+height: 200
+}
+\endqml
+The following code loads this QML file as a component, creates an instance of
+this component using create(), and then queries the \l Item's \l {Item::}{width}
+value:
+\code
+QDeclarativeEngine *engine = new QDeclarativeEngine;
+QDeclarativeComponent component(engine, QUrl::fromLocalFile("main.qml"));
+QObject *myObject = component.create();
+QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(myObject);
+int width = item->width();  // width = 200
+\endcode
+\sa {Using QML in C++ Applications}, {Integrating QML with existing Qt UI code}
 */
 /*!
 \qmlclass Component QDeclarativeComponent
 \since 4.7
-\brief The Component element encapsulates a QML component description.
+\brief The Component element encapsulates a QML component definition.
-Components are reusable, encapsulated Qml element with a well-defined interface.
+Components are reusable, encapsulated QML elements with well-defined interfaces.
-They are often defined in \l {qdeclarativedocuments.html}{Component Files}.
+Components are often defined by \l {qdeclarativedocuments.html}{component files} -
-The \e Component element allows defining components within a QML file.
+that is, \c .qml files. The \e Component element allows components to be defined
-This can be useful for reusing a small component within a single QML
+within QML items rather than in a separate file. This may be useful for reusing
-file, or for defining a component that logically belongs with the
+a small component within a QML file, or for defining a component that logically
-file containing it.
+belongs with other QML components within a file.
+For example, here is a component that is used by multiple \l Loader objects:
 \qml
 Item {
 Component {
 id: redSquare
 Rectangle {
 color: "red"
 width: 10
 height: 10
 }
 }
 Loader { sourceComponent: redSquare }
 Loader { sourceComponent: redSquare; x: 20 }
 }
 \endqml
+Notice that while a \l Rectangle by itself would be automatically
+rendered and displayed, this is not the case for the above rectangle
+because it is defined inside a \c Component. The component encapsulates the
+QML elements within, as if they were defined in a separate \c .qml
+file, and is not loaded until requested (in this case, by the
+two \l Loader objects).
+The Component element is commonly used to provide graphical components
+for views. For example, the ListView::delegate property requires a Component
+to specify how each list item is to be displayed.
+Component objects can also be dynamically generated using
+\l{Qt::createComponent}{Qt.createComponent()}.
 */
 /*!
 \qmlattachedsignal Component::onCompleted()
 {
 Q_D(QDeclarativeComponent);
 d->clear();
-if (url.isRelative() && !url.isEmpty())
+if ((url.isRelative() && !url.isEmpty())
+|| url.scheme() == QLatin1String("file")) // Workaround QTBUG-11929
 d->url = d->engine->baseUrl().resolved(url);
 else
 d->url = url;
 if (url.isEmpty()) {
 {
 }
 /*!
 \qmlmethod object Component::createObject(parent)
-Returns an object instance from this component, or null if object creation fails.
+Creates and returns an object instance of this component that will have the given
+\a parent. Returns null if object creation fails.
 The object will be created in the same context as the one in which the component
 was created. This function will always return null when called on components
 which were not created in QML.
-Note that if the returned object is to be displayed, its \c parent must be set to
+If you wish to create an object without setting a parent, specify \c null for
-an existing item in a scene, or else the object will not be visible. The parent
+the \a parent value. Note that if the returned object is to be displayed, you
-argument is required to help you avoid this, you must explicitly pass in null if
+must provide a valid \a parent value or set the returned object's \l{Item::parent}{parent}
-you wish to create an object without setting a parent.
+property, or else the object will not be visible.
 */
 /*!
 \internal
 A version of create which returns a scriptObject, for use in script.
 */
 QScriptValue QDeclarativeComponent::createObject(QObject* parent)
 {
 Q_D(QDeclarativeComponent);
 QDeclarativeContext* ctxt = creationContext();
-if(!ctxt)
+if(!ctxt && d->engine)
+ctxt = d->engine->rootContext();
+if (!ctxt)
 return QScriptValue(QScriptValue::NullValue);
 QObject* ret = create(ctxt);
 if (!ret)
 return QScriptValue(QScriptValue::NullValue);
-QGraphicsObject* gobj = qobject_cast<QGraphicsObject*>(ret);
-bool needParent = (gobj != 0);
+if (parent) {
-if(parent){
 ret->setParent(parent);
-if (gobj) {
+QList<QDeclarativePrivate::AutoParentFunction> functions = QDeclarativeMetaType::parentFunctions();
-QGraphicsObject* gparent = qobject_cast<QGraphicsObject*>(parent);
-if(gparent){
+bool needParent = false;
-gobj->setParentItem(gparent);
+for (int ii = 0; ii < functions.count(); ++ii) {
+QDeclarativePrivate::AutoParentResult res = functions.at(ii)(ret, parent);
+if (res == QDeclarativePrivate::Parented) {
 needParent = false;
+break;
+} else if (res == QDeclarativePrivate::IncompatibleParent) {
+needParent = true;
 }
 }
-}
-if(needParent)
+if (needParent)
 qWarning("QDeclarativeComponent: Created graphical object was not placed in the graphics scene.");
+}
 QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(d->engine);
 QDeclarativeData::get(ret, true)->setImplicitDestructible();
 return priv->objectClass->newQObject(ret, QMetaType::QObjectStar);
 }
 qWarning("QDeclarativeComponent: Component is not ready");
 return 0;
 }
 QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+bool isRoot = !ep->inBeginCreate;
+if (isRoot)
+QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Creating);
+QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::Creating, cc->url);
 QDeclarativeContextData *ctxt = new QDeclarativeContextData;
 ctxt->isInternal = true;
 ctxt->url = cc->url;
 ctxt->imports = cc->importCache;
 while (enginePriv->erroredBindings) {
 enginePriv->warning(enginePriv->erroredBindings->error);
 enginePriv->erroredBindings->removeError();
 }
 }
 }
 }
 /*!
 This method provides more advanced control over component instance creation.
 void QDeclarativeComponentPrivate::completeCreate()
 {
 if (state.completePending) {
 QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
 complete(ep, &state);
+QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Creating);
 }
 }
 QDeclarativeComponentAttached::QDeclarativeComponentAttached(QObject *parent)
 : QObject(parent), prev(0), next(0)

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613