summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2017-03-14 14:28:01 +0100
committerRobert Griebl <robert.griebl@pelagicore.com>2017-03-14 14:28:32 +0100
commit504d9720ed7ef921af7e5f1ebf709662baac6555 (patch)
treefb6de099c77cf0165ee0cf848d2f275e76ee4917
parent6207e63d7c0e79c3507f40db3f9ad54f536a7dd2 (diff)
parent745759e2a11395fd03b188d88db5b826a6ac91d2 (diff)
downloadneptune-ui-504d9720ed7ef921af7e5f1ebf709662baac6555.tar.gz
Merge remote-tracking branch 'tqc/master' into 5.8
Change-Id: I1b33f5930f3108235d81a6578985aaf460645873
-rw-r--r--sysui/dev/SystemMonitor/MainScreen.qml2
-rw-r--r--sysui/dev/ToolBarMonitor.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/sysui/dev/SystemMonitor/MainScreen.qml b/sysui/dev/SystemMonitor/MainScreen.qml
index b9bf6f5..21d728a 100644
--- a/sysui/dev/SystemMonitor/MainScreen.qml
+++ b/sysui/dev/SystemMonitor/MainScreen.qml
@@ -51,7 +51,7 @@ UIScreen {
function checkReporting() {
SystemMonitor.reportingInterval = root.timeInterval
- SystemMonitor.reportingRange = 10 * 1000
+ SystemMonitor.count = 50
}
TabView {
diff --git a/sysui/dev/ToolBarMonitor.qml b/sysui/dev/ToolBarMonitor.qml
index efd9009..09408bf 100644
--- a/sysui/dev/ToolBarMonitor.qml
+++ b/sysui/dev/ToolBarMonitor.qml
@@ -54,7 +54,7 @@ Rectangle {
function initialize() {
SystemMonitor.reportingInterval = 200
- SystemMonitor.reportingRange = 2000
+ SystemMonitor.count = 10
SystemMonitor.fpsReportingEnabled = root.visible
SystemMonitor.cpuLoadReportingEnabled = root.visible
SystemMonitor.memoryReportingEnabled = root.visible