diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:00:30 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:30:32 +0200 |
| commit | 263a16009e8d08004a546954cd7b2671c26fab9e (patch) | |
| tree | f354063a158ed9bba94ee13c9ff0cd860d654595 /src/virtualkeyboard/virtualkeyboard.pro | |
| parent | 05c70ea4e96ba9ca4348c3dec7e63eb63d474a6d (diff) | |
| parent | aaaa35d40b1bbdf7cdd04aa433f93b248fded26b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: If0c380a53978c981819e9ad18b4d467c1b4aadfb
Diffstat (limited to 'src/virtualkeyboard/virtualkeyboard.pro')
0 files changed, 0 insertions, 0 deletions