History

Merge branch 'master' of github.com:highfidelity/hifi into model-scripting

Seth Alves committed 9 years ago

Commit 693aee02 parents 7afe091 ed380a78 files · +54 −50Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−2
@@ -144,7 +144,7 @@ QString encodeEntityIdIntoEntityUrl(const QString& url, const QString& entityID) · 143 unmodified lines
144144
145145 QString ScriptEngine::logException(const QScriptValue& exception) {
146146 auto message = formatException(exception);
147− scriptErrorMessage(qPrintable(message));
147+ scriptErrorMessage(message);
148148 return message;
149149 }
150150
@@ -455,7 +455,7 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { · 304 unmodified lines
455455 }
456456
457457 void ScriptEngine::scriptErrorMessage(const QString& message) {
458− qCCritical(scriptengine) << message;
458+ qCCritical(scriptengine) << qPrintable(message);
459459 emit errorMessage(message);
460460 }
461461