diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-02 01:01:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-02 08:39:15 +0200 |
| commit | 4c8814a341aace34f9a6011e9ec16048dc0f18b6 (patch) | |
| tree | 3f3193c51c0883ae70de3ae3a3b225b3c7b9b8cc /src/corelib/kernel/qbasictimer.h | |
| parent | 009d86da2d5a928865819fe44b4d1c78d455bbb9 (diff) | |
| parent | 8791a8398ac232a8daab98601f1bef88bdf7638f (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ideaa64d583746f1ce8265997131fb1ce3a9acbcf
Diffstat (limited to 'src/corelib/kernel/qbasictimer.h')
0 files changed, 0 insertions, 0 deletions