diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:03:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:12:00 +0100 |
| commit | 1a9158bfbdd8dd01bac591c11bb0d0bf46514ddb (patch) | |
| tree | 9eaac1ebe4084af206560347508ab75f995940c3 /src/virtualkeyboard/virtualkeyboard.pro | |
| parent | e94108a9b45a5a972e9111a45a27476665484c82 (diff) | |
| parent | e078c5e237142270f5d85a22a1e8adc969668695 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I817d5980ab3132256894b04ddc8daf79d8fc0495
Diffstat (limited to 'src/virtualkeyboard/virtualkeyboard.pro')
0 files changed, 0 insertions, 0 deletions