Merge pull request #1832 from birarda/script-timer

hide ScriptEngine calls from JS

ZappoMan committed 12 years ago

Commit c739c242 parents 6dc959f 028eec73 files · +6 −5Browse files

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

Unified · Split

@@ -106,6 +106,7 @@ bool ScriptEngine::setScriptContents(const QString& scriptContents) { · 105 unmodified lines
106	106	}
107	107
108	108	void ScriptEngine::init() {
	109	+ qDebug() << "Init called!";
109	110	if (_isInitialized) {
110	111	return; // only initialize once
111	112	}
@@ -334,4 +335,3 @@ void ScriptEngine::stopTimer(QTimer *timer) { · 222 unmodified lines
334	335	delete timer;
335	336	}
336	337	}
337		−