diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-16 17:00:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-16 17:00:59 +0200 |
| commit | 9749c5085dc21d2064177aa748f3a9395592a7cf (patch) | |
| tree | 764d7d1cb7910807ff1ee5237a9ed06406fdb892 /src/x11extras/qx11info_x11.cpp | |
| parent | 915ee2598030b799aeb67908bae49a70b4079e37 (diff) | |
| parent | f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8 (diff) | |
| download | qtx11extras-9749c5085dc21d2064177aa748f3a9395592a7cf.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I72701ec74be2b9f2eb26f0383b7795efeb37437c
Diffstat (limited to 'src/x11extras/qx11info_x11.cpp')
0 files changed, 0 insertions, 0 deletions