History

Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco

r3tk0n committed 7 years ago

Commit 4fb7bba2 parents 0d83e62 a980257118 files · +3613 −1426Browse files

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

Unified · Split

interface/src/Application.cpp+9−5
@@ -1211,10 +1211,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1210 unmodified lines
12111211 connect(&domainHandler, SIGNAL(connectedToDomain(QUrl)), SLOT(updateWindowTitle()));
12121212 connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle()));
12131213 connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this]() {
1214− auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
1215− if (tabletScriptingInterface) {
1216− tabletScriptingInterface->setQmlTabletRoot(SYSTEM_TABLET, nullptr);
1217− }
12181214 auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
12191215 entityScriptingInterface->deleteEntity(getTabletScreenID());
12201216 entityScriptingInterface->deleteEntity(getTabletHomeButtonID());
@@ -2896,11 +2892,19 @@ void Application::initializeGL() { · 1675 unmodified lines
28962892 }
28972893
28982894 #if !defined(DISABLE_QML)
2895+ QStringList chromiumFlags;
2896+ // Bug 21993: disable microphone and camera input
2897+ chromiumFlags << "--use-fake-device-for-media-stream";
28992898 // Disable signed distance field font rendering on ATI/AMD GPUs, due to
29002899 // https://highfidelity.manuscript.com/f/cases/13677/Text-showing-up-white-on-Marketplace-app
29012900 std::string vendor{ (const char*)glGetString(GL_VENDOR) };
29022901 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());
29042908 }
29052909 #endif
29062910

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