From 70b37f2e8a4dede381fdb64696be6c29f526862c Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Fri, 27 Oct 2017 11:32:44 -0700
Subject: [PATCH] Cleaning some old tabs
---
interface/resources/qml/Browser.qml | 14 +++++++-------
plugins/hifiSixense/CMakeLists.txt | 6 +++---
tests/controllers/CMakeLists.txt | 2 +-
tests/render-perf/CMakeLists.txt | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml
index 8a6674bc14..1dfc6875bb 100644
--- a/interface/resources/qml/Browser.qml
+++ b/interface/resources/qml/Browser.qml
@@ -233,13 +233,13 @@ ScrollingWindow {
anchors.right: parent.right
onFeaturePermissionRequested: {
- if (feature == 2) { // QWebEnginePage::MediaAudioCapture
- grantFeaturePermission(securityOrigin, feature, true);
- } else {
- permissionsBar.securityOrigin = securityOrigin;
- permissionsBar.feature = feature;
- root.showPermissionsBar();
- }
+ if (feature == 2) { // QWebEnginePage::MediaAudioCapture
+ grantFeaturePermission(securityOrigin, feature, true);
+ } else {
+ permissionsBar.securityOrigin = securityOrigin;
+ permissionsBar.feature = feature;
+ root.showPermissionsBar();
+ }
}
onLoadingChanged: {
diff --git a/plugins/hifiSixense/CMakeLists.txt b/plugins/hifiSixense/CMakeLists.txt
index a503fc5710..6e642fce29 100644
--- a/plugins/hifiSixense/CMakeLists.txt
+++ b/plugins/hifiSixense/CMakeLists.txt
@@ -15,7 +15,7 @@ if (NOT ANDROID)
setup_hifi_plugin(Script Qml Widgets)
link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins)
target_sixense()
- if (WIN32)
- target_link_libraries(${TARGET_NAME} Winmm.lib)
- endif()
+ if (WIN32)
+ target_link_libraries(${TARGET_NAME} Winmm.lib)
+ endif()
endif ()
diff --git a/tests/controllers/CMakeLists.txt b/tests/controllers/CMakeLists.txt
index 623ee7d20e..062d69ca03 100644
--- a/tests/controllers/CMakeLists.txt
+++ b/tests/controllers/CMakeLists.txt
@@ -18,7 +18,7 @@ if (WIN32)
target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
endif()
if (WIN32)
- target_link_libraries(${TARGET_NAME} Winmm.lib)
+ target_link_libraries(${TARGET_NAME} Winmm.lib)
endif()
package_libraries_for_deployment()
diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt
index b7f13c88c5..59e043cd64 100644
--- a/tests/render-perf/CMakeLists.txt
+++ b/tests/render-perf/CMakeLists.txt
@@ -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)
if (WIN32)
- target_link_libraries(${TARGET_NAME} Winmm.lib)
+ target_link_libraries(${TARGET_NAME} Winmm.lib)
endif()
package_libraries_for_deployment()