Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 11:19:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build fixes

Browse source
This commit is contained in:
Dale Glass 2022-10-13 20:15:48 +02:00 committed by ksuprynowicz
parent c691e8691d
commit e5217c44f0
2 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/script-engine/src/ScriptManager.h
View file

@ -669,6 +669,15 @@ public:
void removeAllEventHandlers(const EntityItemID& entityID); void removeAllEventHandlers(const EntityItemID& entityID);
/**
* @brief Return value of the script that finished running
*
* This should only be used after the script terminates.
*
* @return ScriptValue
*/
ScriptValue getReturnValue() const { return _returnValue; }
/**jsdoc /**jsdoc
* Gets the URL for an asset in an external resource bucket. (The location where the bucket is hosted may change over time * Gets the URL for an asset in an external resource bucket. (The location where the bucket is hosted may change over time
* but this method will return the asset's current URL.) * but this method will return the asset's current URL.)

23
tests/script-engine/src/ScriptEngineTests.cpp
View file

@ -69,29 +69,6 @@ void ScriptEngineTests::initTestCase() {
}); });
QSharedPointer<ScriptEngines> ac = DependencyManager::get<ScriptEngines>();
QVERIFY(!ac.isNull());
connect(ac.get(), &ScriptEngines::scriptLoadError, [](const QString& filename, const QString& error){
qWarning() << "Failed to load script" << filename << ":" << error;
});
connect(ac.get(), &ScriptEngines::printedMessage, [](const QString& message, const QString& engineName){
qDebug() << "Printed message from engine" << engineName << ": " << message;
});
connect(ac.get(), &ScriptEngines::infoMessage, [](const QString& message, const QString& engineName){
qInfo() << "Info message from engine" << engineName << ": " << message;
});
connect(ac.get(), &ScriptEngines::warningMessage, [](const QString& message, const QString& engineName){
qWarning() << "Warning from engine" << engineName << ": " << message;
});
connect(ac.get(), &ScriptEngines::errorMessage, [](const QString& message, const QString& engineName){
qCritical() << "Error from engine" << engineName << ": " << message;
});
} }
void ScriptEngineTests::scriptTest() { void ScriptEngineTests::scriptTest() {