Merge lp:~aacid/ubuntu-ui-toolkit/env_var_disable_performance_monitor_warning_count into lp:~aacid/ubuntu-ui-toolkit/performance_monitor_env_vars

[Albert Astals Cid]

Using -1 as PERFORMANCE_MONITOR_WARNING_COUNT_THRESHOLD envvar disables the warning count threshold

Unmerged revisions

1999. By Albert Astals Cid on 2016-06-09

Add envvars for performance monitor variables

=== modified file 'src/Ubuntu/Components/plugin/ucperformancemonitor.cpp'
--- src/Ubuntu/Components/plugin/ucperformancemonitor.cpp	2016-06-09 18:25:04 +0000
+++ src/Ubuntu/Components/plugin/ucperformancemonitor.cpp	2016-06-09 19:55:27 +0000
@@ -71,7 +71,7 @@
 
 void UCPerformanceMonitor::onApplicationStateChanged(Qt::ApplicationState state)
 {
-    if (m_warningCount >= warningCountThreshold) {
+    if (m_warningCount >= warningCountThreshold && warningCountThreshold != -1) {
         // do not monitor performance if the warning count threshold was reached
         return;
     }
@@ -142,7 +142,7 @@
         m_framesAboveThreshold = 0;
     }
 
-    if (m_warningCount >= warningCountThreshold) {
+    if (m_warningCount >= warningCountThreshold && warningCountThreshold != -1) {
         qCWarning(ucPerformance, "Too many warnings were given. Performance monitoring stops.");
         connectToWindow(NULL);
     }