summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-07-24 05:13:45 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-07-24 05:13:45 (GMT)
commitf052ecabf63354737df71ac813adf157158e7b4d (patch)
treef9d5bd8984ee772f030dc757e80f57b86a2c295c /src/declarative/qml/qmlengine.cpp
parent8ba5e3b86984fce9fd3999d643cad6a732653940 (diff)
downloadQt-f052ecabf63354737df71ac813adf157158e7b4d.zip
Qt-f052ecabf63354737df71ac813adf157158e7b4d.tar.gz
Qt-f052ecabf63354737df71ac813adf157158e7b4d.tar.bz2
Rename QmlBindableComponent to QmlComponentJS, as per Aaron's request.
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
-rw-r--r--src/declarative/qml/qmlengine.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 33c6710..69cc542 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -71,7 +71,7 @@
#include <QtCore/qcoreapplication.h>
#include <QtCore/qdir.h>
#include <qmlcomponent.h>
-#include <qmlbindablecomponent.h>
+#include <qmlcomponentjs.h>
#include "private/qmlmetaproperty_p.h"
#include <private/qmlbinding_p.h>
#include <private/qmlvme_p.h>
@@ -602,18 +602,18 @@ QScriptValue QmlEngine::qmlScriptObject(QObject* object, QmlEngine* engine)
*/
QScriptValue QmlEngine::createComponent(QScriptContext *ctxt, QScriptEngine *engine)
{
- QmlBindableComponent* c;
+ QmlComponentJS* c;
QmlEngine* activeEngine = qobject_cast<QmlEngine*>(
engine->globalObject().property(QLatin1String("qmlEngine")).toQObject());
QmlContext* context =activeEngine->d_func()->currentExpression->context();
if(ctxt->argumentCount() != 1 || !activeEngine){
- c = new QmlBindableComponent(activeEngine);
+ c = new QmlComponentJS(activeEngine);
}else{
QUrl url = QUrl(context->resolvedUrl(ctxt->argument(0).toString()));
if(!url.isValid()){
url = QUrl(ctxt->argument(0).toString());
}
- c = new QmlBindableComponent(activeEngine, url, activeEngine);
+ c = new QmlComponentJS(activeEngine, url, activeEngine);
}
c->setContext(context);
return engine->newQObject(c);