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