diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-06-03 10:36:47 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-06-03 10:37:18 +0300 |
| commit | 0091d248e0cef31ea9651884b90fd3e43d4e388d (patch) | |
| tree | a4f8253c120c6d27751d84a1fbac33c49bc80755 /tests | |
| parent | e922b137d268fb79c40c37c992de4f5eca832dd6 (diff) | |
| parent | f6e140a21996c90c698eff15f3f828b182c3c03d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
f6e140a Skip build without QtQuick
a8483ed Doc: Bump version to 5.12.4
Conflicts:
.qmake.conf
Change-Id: I21da08f549f503e45ce6b2ada8afa52ec4e2e2dc
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions