Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 45 files). Show all
Unified · Split
| @@ -12,6 +12,7 @@ · 11 unmodified lines | |||
| 12 | 12 | ||
| 13 | #include <QtWidgets/QApplication> | 13 | #include <QtWidgets/QApplication> |
| 14 | 14 | ||
| 15 | #include <shared/QtHelpers.h> | ||
| 15 | #include <SettingHandle.h> | 16 | #include <SettingHandle.h> |
| 16 | #include <UserActivityLogger.h> | 17 | #include <UserActivityLogger.h> |
| 17 | #include <PathUtils.h> | 18 | #include <PathUtils.h> |
| @@ -452,7 +453,7 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL · 434 unmodified lines | |||
| 452 | bool activateMainWindow, bool reload) { | 453 | bool activateMainWindow, bool reload) { |
| 453 | if (thread() != QThread::currentThread()) { | 454 | if (thread() != QThread::currentThread()) { |
| 454 | ScriptEngine* result { nullptr }; | 455 | ScriptEngine* result { nullptr }; |
| 455 | QMetaObject::invokeMethod(this, "loadScript", Qt::BlockingQueuedConnection, Q_RETURN_ARG(ScriptEngine*, result), | 456 | hifi::qt::blockingInvokeMethod(this, "loadScript", Q_RETURN_ARG(ScriptEngine*, result), |
| 456 | Q_ARG(QUrl, scriptFilename), | 457 | Q_ARG(QUrl, scriptFilename), |
| 457 | Q_ARG(bool, isUserLoaded), | 458 | Q_ARG(bool, isUserLoaded), |
| 458 | Q_ARG(bool, loadScriptFromEditor), | 459 | Q_ARG(bool, loadScriptFromEditor), |