diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:19:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:19:52 +0200 |
| commit | 43c0bfb2af436f6b27cdccb156ecac1d1f3711dc (patch) | |
| tree | 4767c7bd4e78baf68961c474aed727a949f86b74 /src/datavisualizationqml2/datavisualizationqml2_plugin.h | |
| parent | e91b9713cc956770a38c1ba4db996c24612c4fa4 (diff) | |
| parent | 2523056490c3f7a35d176deb583ba46899fe260b (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I709c31705a7edc722039caa4b1c57a0627bde8b9
Diffstat (limited to 'src/datavisualizationqml2/datavisualizationqml2_plugin.h')
0 files changed, 0 insertions, 0 deletions