Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-09 02:48:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add callback to QScriptEngine::include(QString)

Browse source
This commit is contained in:
Ryan Huffman 2015-01-29 09:04:57 -08:00
parent 22cdf1cb22
commit ce9e8910e4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -635,10 +635,10 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac
} }
} }
void ScriptEngine::include(const QString& includeFile) { void ScriptEngine::include(const QString& includeFile, QScriptValue callback) {
QStringList urls; QStringList urls;
urls.append(includeFile); urls.append(includeFile);
include(urls); include(urls, callback);
} }
void ScriptEngine::load(const QString& loadFile) { void ScriptEngine::load(const QString& loadFile) {

2
libraries/script-engine/src/ScriptEngine.h
View file

@ -97,7 +97,7 @@ public slots:
void clearInterval(QObject* timer) { stopTimer(reinterpret_cast<QTimer*>(timer)); } void clearInterval(QObject* timer) { stopTimer(reinterpret_cast<QTimer*>(timer)); }
void clearTimeout(QObject* timer) { stopTimer(reinterpret_cast<QTimer*>(timer)); } void clearTimeout(QObject* timer) { stopTimer(reinterpret_cast<QTimer*>(timer)); }
void include(const QStringList& includeFiles, QScriptValue callback = QScriptValue()); void include(const QStringList& includeFiles, QScriptValue callback = QScriptValue());
void include(const QString& includeFile); void include(const QString& includeFile, QScriptValue callback = QScriptValue());
void load(const QString& loadfile); void load(const QString& loadfile);
void print(const QString& message); void print(const QString& message);
QUrl resolvePath(const QString& path) const; QUrl resolvePath(const QString& path) const;