Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart

Seth Alves committed 10 years ago

Commit ef709c02 parents 00336f4 b8b39b979 files · +2506 −1961Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 79 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−1

@@ -65,7 +65,7 @@ · 64 unmodified lines
65	static const QString SCRIPT_EXCEPTION_FORMAT = "[UncaughtException] %1 in %2:%3";	65	static const QString SCRIPT_EXCEPTION_FORMAT = "[UncaughtException] %1 in %2:%3";
66		66
67	Q_DECLARE_METATYPE(QScriptEngine::FunctionSignature)	67	Q_DECLARE_METATYPE(QScriptEngine::FunctionSignature)
68	static int functionSignatureMetaID = qRegisterMetaType<QScriptEngine::FunctionSignature>();	68	int functionSignatureMetaID = qRegisterMetaType<QScriptEngine::FunctionSignature>();
69		69
70	static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){	70	static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){
71	QString message = "";	71	QString message = "";