1
=== modified file 'src/Ubuntu/Components/plugin/ucperformancemonitor.cpp'
2
--- src/Ubuntu/Components/plugin/ucperformancemonitor.cpp	2016-01-29 07:43:58 +0000
3
+++ src/Ubuntu/Components/plugin/ucperformancemonitor.cpp	2016-02-18 11:38:42 +0000
4
@@ -39,7 +39,6 @@
5
39
39
6
40
UCPerformanceMonitor::~UCPerformanceMonitor()
40
UCPerformanceMonitor::~UCPerformanceMonitor()
7
41
{
41
{
8
42
    connectToWindow(NULL);
9
43
}
42
}
10
44
43
11
45
QQuickWindow* UCPerformanceMonitor::findQQuickWindow()
44
QQuickWindow* UCPerformanceMonitor::findQQuickWindow()
12
@@ -75,6 +74,8 @@
13
75
                                this, &UCPerformanceMonitor::startTimer);
74
                                this, &UCPerformanceMonitor::startTimer);
14
76
            QObject::disconnect(m_window, &QQuickWindow::afterRendering,
75
            QObject::disconnect(m_window, &QQuickWindow::afterRendering,
15
77
                                this, &UCPerformanceMonitor::stopTimer);
76
                                this, &UCPerformanceMonitor::stopTimer);
16
77
            QObject::disconnect(m_window, &QWindow::destroyed,
17
78
                                this, &UCPerformanceMonitor::windowDestroyed);
18
78
        }
79
        }
19
79
80
20
80
        m_window = window;
81
        m_window = window;
21
@@ -86,6 +87,8 @@
22
86
            QObject::connect(m_window, &QQuickWindow::afterRendering,
87
            QObject::connect(m_window, &QQuickWindow::afterRendering,
23
87
                             this, &UCPerformanceMonitor::stopTimer,
88
                             this, &UCPerformanceMonitor::stopTimer,
24
88
                             Qt::DirectConnection);
89
                             Qt::DirectConnection);
25
90
            QObject::connect(m_window, &QWindow::destroyed,
26
91
                             this, &UCPerformanceMonitor::windowDestroyed);
27
89
        }
92
        }
28
90
    }
93
    }
29
91
}
94
}
30
@@ -126,3 +129,8 @@
31
126
        connectToWindow(NULL);
129
        connectToWindow(NULL);
32
127
    }
130
    }
33
128
}
131
}
34
132
35
133
void UCPerformanceMonitor::windowDestroyed()
36
134
{
37
135
    connectToWindow(NULL);
38
136
}
39
129
137
40
=== modified file 'src/Ubuntu/Components/plugin/ucperformancemonitor.h'
41
--- src/Ubuntu/Components/plugin/ucperformancemonitor.h	2016-01-19 13:01:44 +0000
42
+++ src/Ubuntu/Components/plugin/ucperformancemonitor.h	2016-02-18 11:38:42 +0000
43
@@ -38,6 +38,7 @@
44
38
    void connectToWindow(QQuickWindow* window);
38
    void connectToWindow(QQuickWindow* window);
45
39
    void startTimer();
39
    void startTimer();
46
40
    void stopTimer();
40
    void stopTimer();
47
41
    void windowDestroyed();
48
41
42
49
42
private:
43
private:
50
43
    QQuickWindow* findQQuickWindow();
44
    QQuickWindow* findQQuickWindow();
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-02-18
Zsombor Egri		2016-02-18	Approve on 2016-02-18
Review via email: mp+286488@code.launchpad.net