diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 22:39:42 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 22:39:42 +0100 |
| commit | a23d705e1899771d546e8c0d30b24ac58363f2ca (patch) | |
| tree | 1043f9430f6dde740d3bf8a91cb663b70dbf79c6 /mkspecs/linux-icc/qmake.conf | |
| parent | f823af43f243b1848fd4a838847317d0ff6d4fdf (diff) | |
| parent | 49dc9aa409d727824f26b246054a22b5a7dd5980 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
src/plugins/platforms/android/qandroidinputcontext.cpp
Change-Id: I80f35a3d722f1e218ff338b6652e551da45c38e7
Diffstat (limited to 'mkspecs/linux-icc/qmake.conf')
0 files changed, 0 insertions, 0 deletions