Add callback to QScriptEngine::include(QString)

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

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;
urls.append(includeFile);
include(urls);
include(urls, callback);
}
void ScriptEngine::load(const QString& loadFile) {

View file

@ -97,7 +97,7 @@ public slots:
void clearInterval(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 QString& includeFile);
void include(const QString& includeFile, QScriptValue callback = QScriptValue());
void load(const QString& loadfile);
void print(const QString& message);
QUrl resolvePath(const QString& path) const;