diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-05-31 16:13:47 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-05-31 16:13:47 +0200 |
| commit | 2485c31a4875013172bcc98a2c1829435e22d706 (patch) | |
| tree | 1fbd5846d463bd950952489a91b87fcd6c37d6e8 /src/plugins/perfprofiler/perfconfigwidget.ui | |
| parent | 90e9de5d5d50e7d2e04c4597d30c0a2fcf5dd6c4 (diff) | |
| parent | fbeaa774b5528764669f8cf2068b65149fc4adcd (diff) | |
| download | qt-creator-2485c31a4875013172bcc98a2c1829435e22d706.tar.gz | |
Merge remote-tracking branch 'origin/4.15'
Conflicts:
doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
Change-Id: I906330addb7de31e6ed88f88af3fd2adbbe53e1f
Diffstat (limited to 'src/plugins/perfprofiler/perfconfigwidget.ui')
0 files changed, 0 insertions, 0 deletions