Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 20:55:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11687 from ctrlaltdavid/21577

Browse source 
Fix script reload icon not working in Windows developer builds
This commit is contained in:
Ken Cooke 2017-10-26 08:35:59 -07:00 committed by GitHub
commit 30d6185625
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -97,7 +97,6 @@ static const bool HIFI_AUTOREFRESH_FILE_SCRIPTS { true };
Q_DECLARE_METATYPE(QScriptEngine::FunctionSignature) Q_DECLARE_METATYPE(QScriptEngine::FunctionSignature)
int functionSignatureMetaID = qRegisterMetaType<QScriptEngine::FunctionSignature>(); int functionSignatureMetaID = qRegisterMetaType<QScriptEngine::FunctionSignature>();
Q_DECLARE_METATYPE(ScriptEnginePointer)
int scriptEnginePointerMetaID = qRegisterMetaType<ScriptEnginePointer>(); int scriptEnginePointerMetaID = qRegisterMetaType<ScriptEnginePointer>();
Q_LOGGING_CATEGORY(scriptengineScript, "hifi.scriptengine.script") Q_LOGGING_CATEGORY(scriptengineScript, "hifi.scriptengine.script")

2
libraries/script-engine/src/ScriptEngine.h
View file

@ -55,6 +55,8 @@ static const int DEFAULT_ENTITY_PPS_PER_SCRIPT = 900;
class ScriptEngines; class ScriptEngines;
Q_DECLARE_METATYPE(ScriptEnginePointer)
class CallbackData { class CallbackData {
public: public:
QScriptValue function; QScriptValue function;