forked from qt-creator/qt-creator
Fix compilation without declarative backend
This commit is contained in:
@@ -1214,7 +1214,9 @@ Engine::Engine()
|
|||||||
_regexpCtor(0),
|
_regexpCtor(0),
|
||||||
_globalObject(0),
|
_globalObject(0),
|
||||||
_mathObject(0),
|
_mathObject(0),
|
||||||
|
#ifndef NO_DECLARATIVE_BACKEND
|
||||||
_qmlKeysObject(0),
|
_qmlKeysObject(0),
|
||||||
|
#endif
|
||||||
_convertToNumber(this),
|
_convertToNumber(this),
|
||||||
_convertToString(this),
|
_convertToString(this),
|
||||||
_convertToObject(this)
|
_convertToObject(this)
|
||||||
@@ -1670,14 +1672,20 @@ void Engine::initializePrototypes()
|
|||||||
_globalObject->setProperty("Date", dateCtor());
|
_globalObject->setProperty("Date", dateCtor());
|
||||||
_globalObject->setProperty("RegExp", regexpCtor());
|
_globalObject->setProperty("RegExp", regexpCtor());
|
||||||
|
|
||||||
|
#ifndef NO_DECLARATIVE_BACKEND
|
||||||
_qmlKeysObject = new QmlAttachedKeys(this);
|
_qmlKeysObject = new QmlAttachedKeys(this);
|
||||||
_globalObject->setProperty("Keys", _qmlKeysObject); // ### attach it to the current scope, and not to the global object
|
_globalObject->setProperty("Keys", _qmlKeysObject); // ### attach it to the current scope, and not to the global object
|
||||||
registerObject(_qmlKeysObject);
|
registerObject(_qmlKeysObject);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
const ObjectValue *Engine::qmlKeysObject()
|
const ObjectValue *Engine::qmlKeysObject()
|
||||||
{
|
{
|
||||||
|
#ifndef NO_DECLARATIVE_BACKEND
|
||||||
return _qmlKeysObject;
|
return _qmlKeysObject;
|
||||||
|
#else
|
||||||
|
return 0;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
const Value *Engine::defaultValueForBuiltinType(const QString &typeName) const
|
const Value *Engine::defaultValueForBuiltinType(const QString &typeName) const
|
||||||
|
|||||||
@@ -504,7 +504,9 @@ private:
|
|||||||
|
|
||||||
ObjectValue *_globalObject;
|
ObjectValue *_globalObject;
|
||||||
ObjectValue *_mathObject;
|
ObjectValue *_mathObject;
|
||||||
|
#ifndef NO_DECLARATIVE_BACKEND
|
||||||
ObjectValue *_qmlKeysObject;
|
ObjectValue *_qmlKeysObject;
|
||||||
|
#endif
|
||||||
|
|
||||||
NullValue _nullValue;
|
NullValue _nullValue;
|
||||||
UndefinedValue _undefinedValue;
|
UndefinedValue _undefinedValue;
|
||||||
|
|||||||
Reference in New Issue
Block a user