History

fixed merge conflicts in marketplacesInject.js

Elisa Lupin-Jimenez committed 9 years ago

Commit a2e407f2 parents 1ac9536 6fdee3715 files · +753 −63Browse files

Showing the changes to interface/src/Application.cpp (1 of 15 files). Show all

Unified · Split

interface/src/Application.cpp+6−0
@@ -193,6 +193,9 @@ · 192 unmodified lines
193193 #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h>
194194 #include <EntityScriptClient.h>
195195 #include <ModelScriptingInterface.h>
196+#include "commerce/Ledger.h"
197+#include "commerce/Wallet.h"
198+#include "commerce/QmlCommerce.h"
196199
197200 // On Windows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU
198201 // FIXME seems to be broken.
@@ -598,6 +601,8 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 399 unmodified lines
598601 DependencyManager::set<CloseEventSender>();
599602 DependencyManager::set<ResourceManager>();
600603 DependencyManager::set<ContextOverlayInterface>();
604+ DependencyManager::set<Ledger>();
605+ DependencyManager::set<Wallet>();
601606
602607 return previousSessionCrashed;
603608 }
@@ -2057,6 +2062,7 @@ void Application::initializeUi() { · 1453 unmodified lines
20572062 LoginDialog::registerType();
20582063 Tooltip::registerType();
20592064 UpdateDialog::registerType();
2065+ QmlCommerce::registerType();
20602066 qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem");
20612067 qmlRegisterType<Preference>("Hifi", 1, 0, "Preference");
20622068

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