History

First steps

Zach Fox committed 9 years ago

Commit dafa8301 parent 0c9184519 files · +110 −85Browse files

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

Unified · Split

interface/src/Application.cpp+26−1
@@ -2246,7 +2246,32 @@ void Application::initializeUi() { · 2245 unmodified lines
22462246 LoginDialog::registerType();
22472247 Tooltip::registerType();
22482248 UpdateDialog::registerType();
2249− QmlCommerce::registerType();
2249+ QmlContextCallback callback = [](QQmlContext* context, QObject*) {
2250+ context->setContextProperty("Commerce", new QmlCommerce());
2251+ };
2252+ OffscreenQmlSurface::addWhitelistContextHandler({
2253+ QUrl{ "qrc://qml/hifi/commerce/checkout/Checkout.qml" },
2254+ QUrl{ "qrc://qml/hifi/commerce/common/CommerceLightbox.qml" },
2255+ QUrl{ "qrc://qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml" },
2256+ QUrl{ "qrc://qml/hifi/commerce/common/FirstUseTutorial.qml" },
2257+ QUrl{ "qrc://qml/hifi/commerce/common/SortableListModel.qml" },
2258+ QUrl{ "qrc://qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml" },
2259+ QUrl{ "qrc://qml/hifi/commerce/purchases/PurchasedItem.qml" },
2260+ QUrl{ "qrc://qml/hifi/commerce/purchases/Purchases.qml" },
2261+ QUrl{ "qrc://qml/hifi/commerce/wallet/Help.qml" },
2262+ QUrl{ "qrc://qml/hifi/commerce/wallet/NeedsLogIn.qml" },
2263+ QUrl{ "qrc://qml/hifi/commerce/wallet/PassphraseChange.qml" },
2264+ QUrl{ "qrc://qml/hifi/commerce/wallet/PassphraseModal.qml" },
2265+ QUrl{ "qrc://qml/hifi/commerce/wallet/PassphraseSelection.qml" },
2266+ QUrl{ "qrc://qml/hifi/commerce/wallet/Security.qml" },
2267+ QUrl{ "qrc://qml/hifi/commerce/wallet/SecurityImageChange.qml" },
2268+ QUrl{ "qrc://qml/hifi/commerce/wallet/SecurityImageModel.qml" },
2269+ QUrl{ "qrc://qml/hifi/commerce/wallet/SecurityImageSelection.qml" },
2270+ QUrl{ "qrc://qml/hifi/commerce/wallet/SendMoney.qml" },
2271+ QUrl{ "qrc://qml/hifi/commerce/wallet/Wallet.qml" },
2272+ QUrl{ "qrc://qml/hifi/commerce/wallet/WalletHome.qml" },
2273+ QUrl{ "qrc://qml/hifi/commerce/wallet/WalletSetup.qml" },
2274+ }, callback);
22502275 qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem");
22512276 qmlRegisterType<Preference>("Hifi", 1, 0, "Preference");
22522277