diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-08-14 12:37:06 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-08-14 12:37:06 +0200 |
| commit | b5f49273b0fef12b061a68879ce20e56c53bdde1 (patch) | |
| tree | f860bbbf6e24f2c3040e7fa65298636cd8079277 /src/plugins/qmlprofiler/qmlprofiler.qbs | |
| parent | 63551d7711170e2f0c96922d465dcea89f2963f7 (diff) | |
| parent | a094841bdda5461ebeaeab4620dde8222fa8312d (diff) | |
Merge remote-tracking branch 'origin/4.3' into 4.4
Conflicts:
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
Change-Id: Ib1d75a8572f650898cb598d008867e2c0514d752
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofiler.qbs')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofiler.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs index 8bf7b5147b..02a08fb656 100644 --- a/src/plugins/qmlprofiler/qmlprofiler.qbs +++ b/src/plugins/qmlprofiler/qmlprofiler.qbs @@ -92,6 +92,7 @@ QtcPlugin { "qmlprofilerbindingloopsrenderpass_test.h", "qmlprofilerclientmanager_test.cpp", "qmlprofilerclientmanager_test.h", "qmlprofilerconfigwidget_test.cpp", "qmlprofilerconfigwidget_test.h", + "qmlprofilertraceview_test.cpp", "qmlprofilertraceview_test.h", ] } } |