Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 17:50:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleaning some old tabs

Browse source
This commit is contained in:
luiscuenca 2017-10-27 11:32:44 -07:00
parent f32282afdd
commit 70b37f2e8a
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/resources/qml/Browser.qml
View file

@ -233,13 +233,13 @@ ScrollingWindow {
anchors.right: parent.right anchors.right: parent.right
onFeaturePermissionRequested: { onFeaturePermissionRequested: {
if (feature == 2) { // QWebEnginePage::MediaAudioCapture if (feature == 2) { // QWebEnginePage::MediaAudioCapture
grantFeaturePermission(securityOrigin, feature, true); grantFeaturePermission(securityOrigin, feature, true);
} else { } else {
permissionsBar.securityOrigin = securityOrigin; permissionsBar.securityOrigin = securityOrigin;
permissionsBar.feature = feature; permissionsBar.feature = feature;
root.showPermissionsBar(); root.showPermissionsBar();
} }
} }
onLoadingChanged: { onLoadingChanged: {

6
plugins/hifiSixense/CMakeLists.txt
View file

@ -15,7 +15,7 @@ if (NOT ANDROID)
setup_hifi_plugin(Script Qml Widgets) setup_hifi_plugin(Script Qml Widgets)
link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins) link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins)
target_sixense() target_sixense()
if (WIN32) if (WIN32)
target_link_libraries(${TARGET_NAME} Winmm.lib) target_link_libraries(${TARGET_NAME} Winmm.lib)
endif() endif()
endif () endif ()

2
tests/controllers/CMakeLists.txt
View file

@ -18,7 +18,7 @@ if (WIN32)
target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
endif() endif()
if (WIN32) if (WIN32)
target_link_libraries(${TARGET_NAME} Winmm.lib) target_link_libraries(${TARGET_NAME} Winmm.lib)
endif() endif()
package_libraries_for_deployment() package_libraries_for_deployment()

2
tests/render-perf/CMakeLists.txt
View file

@ -15,7 +15,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
link_hifi_libraries(shared networking model fbx ktx image octree gl gpu gpu-gl render model-networking networking render-utils entities entities-renderer animation audio avatars script-engine physics procedural midi ui) link_hifi_libraries(shared networking model fbx ktx image octree gl gpu gpu-gl render model-networking networking render-utils entities entities-renderer animation audio avatars script-engine physics procedural midi ui)
if (WIN32) if (WIN32)
target_link_libraries(${TARGET_NAME} Winmm.lib) target_link_libraries(${TARGET_NAME} Winmm.lib)
endif() endif()
package_libraries_for_deployment() package_libraries_for_deployment()