diff options
author | Liang Qi <liang.qi@qt.io> | 2019-09-12 10:00:03 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 10:00:03 +0200 |
commit | 5b0bbd7345b698faab0116b821802fb4a30c0fa4 (patch) | |
tree | 0255e40f5366123bedefcbc9ad7d482f2e8198a2 /.qmake.conf | |
parent | d91b839d67bcfa1cfeb3d095b6885c97c53b9812 (diff) | |
parent | 8daefcfd8e1bf41ae4d06c7a79a526b81a78dc58 (diff) |
Merge remote-tracking branch 'origin/5.14' into wip/qt6
Change-Id: Ida28f81014758a4b164a7ddc958b3ba5afc74c79
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions