History

Switch to preprocessor macro for blocking invokes to capture function information

Brad Davis committed 9 years ago

Commit 6fc82bb1 parent 9c37b2839 files · +124 −118Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−1
@@ -965,7 +965,7 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi · 964 unmodified lines
965 qCDebug(scriptengine) << "*** WARNING *** ScriptEngine::evaluate() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "965 qCDebug(scriptengine) << "*** WARNING *** ScriptEngine::evaluate() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "
966 "sourceCode:" << sourceCode << " fileName:" << fileName << "lineNumber:" << lineNumber;966 "sourceCode:" << sourceCode << " fileName:" << fileName << "lineNumber:" << lineNumber;
967#endif967#endif
968 hifi::qt::blockingInvokeMethod(this, "evaluate",968 BLOCKING_INVOKE_METHOD(this, "evaluate",
969 Q_RETURN_ARG(QScriptValue, result),969 Q_RETURN_ARG(QScriptValue, result),
970 Q_ARG(const QString&, sourceCode),970 Q_ARG(const QString&, sourceCode),
971 Q_ARG(const QString&, fileName),971 Q_ARG(const QString&, fileName),