diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-05 10:25:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-05 10:25:15 +0100 |
| commit | 6fe4c1f2803abac74da152b9a5656eff2d71dceb (patch) | |
| tree | 7d90d1a71d8cfb938f9a8fad33b8fbeeb66019f7 /tools/qmlprofiler/qmlprofilerapplication.h | |
| parent | 2e65f6c2a5d84f4369245cabdc03eca4c19851f0 (diff) | |
| parent | c2bd33af9fb548ff20bf34323271baa89cbc8a55 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
Change-Id: I64f7c1d776fab3cad4530f291b93afd2a8fb8533
Diffstat (limited to 'tools/qmlprofiler/qmlprofilerapplication.h')
| -rw-r--r-- | tools/qmlprofiler/qmlprofilerapplication.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qmlprofiler/qmlprofilerapplication.h b/tools/qmlprofiler/qmlprofilerapplication.h index 13f0f041f0..4946622902 100644 --- a/tools/qmlprofiler/qmlprofilerapplication.h +++ b/tools/qmlprofiler/qmlprofilerapplication.h @@ -69,6 +69,7 @@ private: void run(); void tryToConnect(); void connected(); + void disconnected(); void processHasOutput(); void processFinished(); |