History

Install marketplace item tester

Kerry Ivan Kurian committed 8 years ago

Commit f2a046d1 parent 79cf1cb4 files · +186 −4Browse files

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

Unified · Split

interface/src/Application.cpp+5−4
@@ -1691,21 +1691,21 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1690 unmodified lines
1691 return DependencyManager::get<OffscreenUi>()->navigationFocused() ? 1 : 0;1691 return DependencyManager::get<OffscreenUi>()->navigationFocused() ? 1 : 0;
1692 });1692 });
1693 _applicationStateDevice->setInputVariant(STATE_PLATFORM_WINDOWS, []() -> float {1693 _applicationStateDevice->setInputVariant(STATE_PLATFORM_WINDOWS, []() -> float {
1694#if defined(Q_OS_WIN) 1694#if defined(Q_OS_WIN)
1695 return 1;1695 return 1;
1696#else1696#else
1697 return 0;1697 return 0;
1698#endif1698#endif
1699 });1699 });
1700 _applicationStateDevice->setInputVariant(STATE_PLATFORM_MAC, []() -> float {1700 _applicationStateDevice->setInputVariant(STATE_PLATFORM_MAC, []() -> float {
1701#if defined(Q_OS_MAC) 1701#if defined(Q_OS_MAC)
1702 return 1;1702 return 1;
1703#else1703#else
1704 return 0;1704 return 0;
1705#endif1705#endif
1706 });1706 });
1707 _applicationStateDevice->setInputVariant(STATE_PLATFORM_ANDROID, []() -> float {1707 _applicationStateDevice->setInputVariant(STATE_PLATFORM_ANDROID, []() -> float {
1708#if defined(Q_OS_ANDROID) 1708#if defined(Q_OS_ANDROID)
1709 return 1;1709 return 1;
1710#else1710#else
1711 return 0;1711 return 0;
@@ -2881,9 +2881,10 @@ void Application::initializeUi() { · 1169 unmodified lines
2881 QUrl{ "hifi/commerce/common/CommerceLightbox.qml" },2881 QUrl{ "hifi/commerce/common/CommerceLightbox.qml" },
2882 QUrl{ "hifi/commerce/common/EmulatedMarketplaceHeader.qml" },2882 QUrl{ "hifi/commerce/common/EmulatedMarketplaceHeader.qml" },
2883 QUrl{ "hifi/commerce/common/FirstUseTutorial.qml" },2883 QUrl{ "hifi/commerce/common/FirstUseTutorial.qml" },
2884 QUrl{ "hifi/commerce/common/SortableListModel.qml" },
2885 QUrl{ "hifi/commerce/common/sendAsset/SendAsset.qml" },2884 QUrl{ "hifi/commerce/common/sendAsset/SendAsset.qml" },
2885 QUrl{ "hifi/commerce/common/SortableListModel.qml" },
2886 QUrl{ "hifi/commerce/inspectionCertificate/InspectionCertificate.qml" },2886 QUrl{ "hifi/commerce/inspectionCertificate/InspectionCertificate.qml" },
2887 QUrl{ "hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml"},
2887 QUrl{ "hifi/commerce/purchases/PurchasedItem.qml" },2888 QUrl{ "hifi/commerce/purchases/PurchasedItem.qml" },
2888 QUrl{ "hifi/commerce/purchases/Purchases.qml" },2889 QUrl{ "hifi/commerce/purchases/Purchases.qml" },
2889 QUrl{ "hifi/commerce/wallet/Help.qml" },2890 QUrl{ "hifi/commerce/wallet/Help.qml" },