diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-21 13:09:53 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-21 13:10:21 +0300 |
| commit | ecc5c864e3a18560f5d8d7120e8c2dc54477d563 (patch) | |
| tree | 407c9dffea7094f5246badc48419ca667db6edc3 /tradeshow/knx-demo/3d-Alexa-knx-demo/housemodel.cpp | |
| parent | 97863a4992276a3d1aeb3c1bb9ef5a280a5e8b12 (diff) | |
| parent | 7e1d96ef9ca1ff2449d1d3c4b1eefb42234da7dd (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
7e1d96e Use Material style only on devices with gpu
Change-Id: Ia0a48b7d6d3fde45cb4c68344a663ed15bf0d3c9
Diffstat (limited to 'tradeshow/knx-demo/3d-Alexa-knx-demo/housemodel.cpp')
0 files changed, 0 insertions, 0 deletions