Showing the changes to interface/src/Application.cpp (1 of 15 files). Show all
Unified · Split
| @@ -193,6 +193,9 @@ · 192 unmodified lines | |||
| 193 | #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h> | 193 | #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h> |
| 194 | #include <EntityScriptClient.h> | 194 | #include <EntityScriptClient.h> |
| 195 | #include <ModelScriptingInterface.h> | 195 | #include <ModelScriptingInterface.h> |
| 196 | #include "commerce/Ledger.h" | ||
| 197 | #include "commerce/Wallet.h" | ||
| 198 | #include "commerce/QmlCommerce.h" | ||
| 196 | 199 | ||
| 197 | // On Windows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU | 200 | // On Windows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU |
| 198 | // FIXME seems to be broken. | 201 | // FIXME seems to be broken. |
| @@ -598,6 +601,8 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 399 unmodified lines | |||
| 598 | DependencyManager::set<CloseEventSender>(); | 601 | DependencyManager::set<CloseEventSender>(); |
| 599 | DependencyManager::set<ResourceManager>(); | 602 | DependencyManager::set<ResourceManager>(); |
| 600 | DependencyManager::set<ContextOverlayInterface>(); | 603 | DependencyManager::set<ContextOverlayInterface>(); |
| 604 | DependencyManager::set<Ledger>(); | ||
| 605 | DependencyManager::set<Wallet>(); | ||
| 601 | 606 | ||
| 602 | return previousSessionCrashed; | 607 | return previousSessionCrashed; |
| 603 | } | 608 | } |
| @@ -2057,6 +2062,7 @@ void Application::initializeUi() { · 1453 unmodified lines | |||
| 2057 | LoginDialog::registerType(); | 2062 | LoginDialog::registerType(); |
| 2058 | Tooltip::registerType(); | 2063 | Tooltip::registerType(); |
| 2059 | UpdateDialog::registerType(); | 2064 | UpdateDialog::registerType(); |
| 2065 | QmlCommerce::registerType(); | ||
| 2060 | qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem"); | 2066 | qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem"); |
| 2061 | qmlRegisterType<Preference>("Hifi", 1, 0, "Preference"); | 2067 | qmlRegisterType<Preference>("Hifi", 1, 0, "Preference"); |
| 2062 | 2068 | ||