Skip to content
Snippets Groups Projects
Commit 521c69a7 authored by Simon Hausmann's avatar Simon Hausmann
Browse files

Fix compilation without declarative backend

parent e722570f
No related branches found
No related tags found
No related merge requests found
......@@ -1214,7 +1214,9 @@ Engine::Engine()
_regexpCtor(0),
_globalObject(0),
_mathObject(0),
#ifndef NO_DECLARATIVE_BACKEND
_qmlKeysObject(0),
#endif
_convertToNumber(this),
_convertToString(this),
_convertToObject(this)
......@@ -1670,14 +1672,20 @@ void Engine::initializePrototypes()
_globalObject->setProperty("Date", dateCtor());
_globalObject->setProperty("RegExp", regexpCtor());
#ifndef NO_DECLARATIVE_BACKEND
_qmlKeysObject = new QmlAttachedKeys(this);
_globalObject->setProperty("Keys", _qmlKeysObject); // ### attach it to the current scope, and not to the global object
registerObject(_qmlKeysObject);
#endif
}
const ObjectValue *Engine::qmlKeysObject()
{
#ifndef NO_DECLARATIVE_BACKEND
return _qmlKeysObject;
#else
return 0;
#endif
}
const Value *Engine::defaultValueForBuiltinType(const QString &typeName) const
......
......@@ -504,7 +504,9 @@ private:
ObjectValue *_globalObject;
ObjectValue *_mathObject;
#ifndef NO_DECLARATIVE_BACKEND
ObjectValue *_qmlKeysObject;
#endif
NullValue _nullValue;
UndefinedValue _undefinedValue;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment