Showing the changes to interface/src/Application.cpp (1 of 118 files). Show all
Unified · Split
| @@ -1211,10 +1211,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1210 unmodified lines | ||
| 1211 | 1211 | connect(&domainHandler, SIGNAL(connectedToDomain(QUrl)), SLOT(updateWindowTitle())); |
| 1212 | 1212 | connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle())); |
| 1213 | 1213 | connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this]() { |
| 1214 | − auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>(); | |
| 1215 | − if (tabletScriptingInterface) { | |
| 1216 | − tabletScriptingInterface->setQmlTabletRoot(SYSTEM_TABLET, nullptr); | |
| 1217 | − } | |
| 1218 | 1214 | auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>(); |
| 1219 | 1215 | entityScriptingInterface->deleteEntity(getTabletScreenID()); |
| 1220 | 1216 | entityScriptingInterface->deleteEntity(getTabletHomeButtonID()); |
| @@ -2896,11 +2892,19 @@ void Application::initializeGL() { · 1675 unmodified lines | ||
| 2896 | 2892 | } |
| 2897 | 2893 | |
| 2898 | 2894 | #if !defined(DISABLE_QML) |
| 2895 | + QStringList chromiumFlags; | |
| 2896 | + // Bug 21993: disable microphone and camera input | |
| 2897 | + chromiumFlags << "--use-fake-device-for-media-stream"; | |
| 2899 | 2898 | // Disable signed distance field font rendering on ATI/AMD GPUs, due to |
| 2900 | 2899 | // https://highfidelity.manuscript.com/f/cases/13677/Text-showing-up-white-on-Marketplace-app |
| 2901 | 2900 | std::string vendor{ (const char*)glGetString(GL_VENDOR) }; |
| 2902 | 2901 | if ((vendor.find("AMD") != std::string::npos) || (vendor.find("ATI") != std::string::npos)) { |
| 2903 | − qputenv("QTWEBENGINE_CHROMIUM_FLAGS", QByteArray("--disable-distance-field-text")); | |
| 2902 | + chromiumFlags << "--disable-distance-field-text"; | |
| 2903 | + } | |
| 2904 | + | |
| 2905 | + // Ensure all Qt webengine processes launched from us have the appropriate command line flags | |
| 2906 | + if (!chromiumFlags.empty()) { | |
| 2907 | + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", chromiumFlags.join(' ').toLocal8Bit()); | |
| 2904 | 2908 | } |
| 2905 | 2909 | #endif |
| 2906 | 2910 | |