diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-11 18:01:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-11 18:10:41 +0100 |
| commit | f4d8cafc1b034f544ca84b849c23ab99bc1600e7 (patch) | |
| tree | f1150b5aeaec4753f2ddfcd17643666b3a82dd9d /qmake/Makefile.win32 | |
| parent | e5b422382a512a8267a0eb24e6543a8cf84478d9 (diff) | |
| parent | b03133231b99922a72831c4ec23faf55516ef404 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/3rdparty/harfbuzz-ng/src/hb-private.hh
src/sql/doc/snippets/code/doc_src_sql-driver.cpp
src/sql/doc/src/sql-driver.qdoc
Change-Id: I38f0e82fcd37926cbf3c1915e009a731040d4598
Diffstat (limited to 'qmake/Makefile.win32')
0 files changed, 0 insertions, 0 deletions