History

Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface

Brad Hefta-Gaub committed 12 years ago

Commit d4331db2 parents 43da1ed bb41fe6386 files · +11197 −98919Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−4
@@ -148,7 +148,7 @@ void ScriptEngine::evaluate() { · 147 unmodified lines
148148
149149 if (_engine.hasUncaughtException()) {
150150 int line = _engine.uncaughtExceptionLineNumber();
151− qDebug() << "Uncaught exception at line" << line << ":" << result.toString() << "\n";
151+ qDebug() << "Uncaught exception at line" << line << ":" << result.toString();
152152 }
153153 }
154154
@@ -159,10 +159,9 @@ void ScriptEngine::run() { · 4 unmodified lines
159159 _isRunning = true;
160160
161161 QScriptValue result = _engine.evaluate(_scriptContents);
162−
163162 if (_engine.hasUncaughtException()) {
164163 int line = _engine.uncaughtExceptionLineNumber();
165− qDebug() << "Uncaught exception at line" << line << ":" << result.toString() << "\n";
164+ qDebug() << "Uncaught exception at line" << line << ":" << result.toString();
166165 }
167166
168167 timeval startTime;
@@ -219,7 +218,7 @@ void ScriptEngine::run() { · 50 unmodified lines
219218
220219 if (_engine.hasUncaughtException()) {
221220 int line = _engine.uncaughtExceptionLineNumber();
222− qDebug() << "Uncaught exception at line" << line << ":" << _engine.uncaughtException().toString() << "\n";
221+ qDebug() << "Uncaught exception at line" << line << ":" << _engine.uncaughtException().toString();
223222 }
224223 }
225224 cleanMenuItems();