diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-12-02 08:54:43 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-12-02 08:54:43 (GMT) |
commit | 5247ee562f76a51b8a81735d7da709d1b9b63796 (patch) | |
tree | bbe2b7e2b538082ee158ccef7e8f7d1020798e47 /src/declarative/qml/qmlvme.cpp | |
parent | bd22fbc0447faa58f3a4ab52ed5545f12a47cd5c (diff) | |
parent | b1ca4dbd2935cb2647aa1650a5185cb918ecb21d (diff) | |
download | Qt-5247ee562f76a51b8a81735d7da709d1b9b63796.zip Qt-5247ee562f76a51b8a81735d7da709d1b9b63796.tar.gz Qt-5247ee562f76a51b8a81735d7da709d1b9b63796.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlvme.cpp')
-rw-r--r-- | src/declarative/qml/qmlvme.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index f2fb217..87672d0 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -41,13 +41,13 @@ #include "qmlvme_p.h" #include "qmlcompiler_p.h" -#include <private/qfxperf_p_p.h> -#include <private/qmlboundsignal_p.h> -#include <private/qmlstringconverters_p.h> -#include "private/qmetaobjectbuilder_p.h" -#include "private/qmldeclarativedata_p.h" +#include "qfxperf_p_p.h" +#include "qmlboundsignal_p.h" +#include "qmlstringconverters_p.h" +#include "qmetaobjectbuilder_p.h" +#include "qmldeclarativedata_p.h" #include <qml.h> -#include <private/qmlcustomparser_p.h> +#include "qmlcustomparser_p.h" #include <QStack> #include <QWidget> #include <QColor> @@ -58,15 +58,16 @@ #include <qmlcontext.h> #include <qmlcomponent.h> #include <qmlbinding.h> -#include <private/qmlengine_p.h> -#include <private/qmlcomponent_p.h> -#include "private/qmlvmemetaobject_p.h" +#include "qmlengine_p.h" +#include "qmlcomponent_p.h" +#include "qmlvmemetaobject_p.h" #include <QtCore/qdebug.h> #include <QtCore/qvarlengtharray.h> #include <QtGui/qapplication.h> -#include <private/qmlbinding_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmlbindingoptimizations_p.h> +#include "qmlbinding_p.h" +#include "qmlcontext_p.h" +#include "qmlbindingoptimizations_p.h" +#include "qmlglobal_p.h" #include <qmlscriptstring.h> QT_BEGIN_NAMESPACE @@ -102,7 +103,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledData *comp, int start, int count, const QBitField &bindingSkipList) { - QStack<QObject *> stack; + QmlVMEStack<QObject *> stack; if (start == -1) start = 0; if (count == -1) count = comp->bytecode.count(); @@ -121,14 +122,14 @@ void QmlVME::runDeferred(QObject *object) QmlCompiledData *comp = data->deferredComponent; int start = data->deferredIdx + 1; int count = data->deferredComponent->bytecode.at(data->deferredIdx).defer.deferCount; - QStack<QObject *> stack; + QmlVMEStack<QObject *> stack; stack.push(object); run(stack, ctxt, comp, start, count, QBitField()); } QBitField bindingSkipList; -QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, +QObject *QmlVME::run(QmlVMEStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData *comp, int start, int count, const QBitField &bindingSkipList) @@ -147,7 +148,7 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlEnginePrivate::SimpleList<QmlAbstractBinding> bindValues; QmlEnginePrivate::SimpleList<QmlParserStatus> parserStatus; - QStack<ListInstance> qliststack; + QmlVMEStack<ListInstance> qliststack; vmeErrors.clear(); QmlEnginePrivate *ep = QmlEnginePrivate::get(ctxt->engine()); @@ -214,7 +215,8 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, // TODO: parent might be a layout } } else { - o->setParent(parent); + QmlGraphics_setParent_noEvent(o, parent); + // o->setParent(parent); } } stack.push(o); |