Showing the changes to interface/src/Application.cpp (1 of 79 files). Show all
Unified · Split
| @@ -811,6 +811,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 810 unmodified lines | ||
| 811 | 811 | } |
| 812 | 812 | |
| 813 | 813 | // Tell the plugin manager about our statically linked plugins |
| 814 | + DependencyManager::set<ScriptInitializers>(); | |
| 814 | 815 | DependencyManager::set<PluginManager>(); |
| 815 | 816 | auto pluginManager = PluginManager::getInstance(); |
| 816 | 817 | pluginManager->setInputPluginProvider([] { return getInputPlugins(); }); |
| @@ -860,7 +861,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 43 unmodified lines | ||
| 860 | 861 | #endif |
| 861 | 862 | DependencyManager::set<StatTracker>(); |
| 862 | 863 | DependencyManager::set<ScriptEngines>(ScriptEngine::CLIENT_SCRIPT, defaultScriptsOverrideOption); |
| 863 | − DependencyManager::set<ScriptInitializerMixin, NativeScriptInitializers>(); | |
| 864 | 864 | DependencyManager::set<Preferences>(); |
| 865 | 865 | DependencyManager::set<recording::Deck>(); |
| 866 | 866 | DependencyManager::set<recording::Recorder>(); |
| @@ -3429,7 +3429,7 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) { · 2562 unmodified lines | ||
| 3429 | 3429 | surfaceContext->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data()); |
| 3430 | 3430 | surfaceContext->setContextProperty("Desktop", DependencyManager::get<DesktopScriptingInterface>().data()); |
| 3431 | 3431 | surfaceContext->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance()); |
| 3432 | − surfaceContext->setContextProperty("Settings", SettingsScriptingInterface::getInstance()); | |
| 3432 | + surfaceContext->setContextProperty("Settings", new QMLSettingsScriptingInterface(surfaceContext)); | |
| 3433 | 3433 | surfaceContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data()); |
| 3434 | 3434 | surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data()); |
| 3435 | 3435 | surfaceContext->setContextProperty("LocationBookmarks", DependencyManager::get<LocationBookmarks>().data()); |
| @@ -3545,7 +3545,7 @@ void Application::setupQmlSurface(QQmlContext* surfaceContext, bool setAdditiona · 109 unmodified lines | ||
| 3545 | 3545 | surfaceContext->setContextProperty("offscreenFlags", flags); |
| 3546 | 3546 | surfaceContext->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data()); |
| 3547 | 3547 | |
| 3548 | − surfaceContext->setContextProperty("Settings", SettingsScriptingInterface::getInstance()); | |
| 3548 | + surfaceContext->setContextProperty("Settings", new QMLSettingsScriptingInterface(surfaceContext)); | |
| 3549 | 3549 | surfaceContext->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance()); |
| 3550 | 3550 | surfaceContext->setContextProperty("Performance", new PerformanceScriptingInterface()); |
| 3551 | 3551 | |