History

Merge branch 'hifi-master' into kpi-v1-modkit-rc

humbletim committed 7 years ago

Commit 058c81a2 parents bac59b5 4dc67b5172 files · +7718 −1879Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+2−1
@@ -457,7 +457,8 @@ ScriptEnginePointer ScriptEngines::loadScript(const QUrl& scriptFilename, bool i · 456 unmodified lines
457457 Q_ARG(bool, isUserLoaded),
458458 Q_ARG(bool, loadScriptFromEditor),
459459 Q_ARG(bool, activateMainWindow),
460− Q_ARG(bool, reload));
460+ Q_ARG(bool, reload),
461+ Q_ARG(bool, quitWhenFinished));
461462 return result;
462463 }
463464 QUrl scriptUrl;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t