diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-19 14:56:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-19 16:02:52 +0100 |
| commit | 48577b2e7f17a26c1d903cb8ecbd30e41c231137 (patch) | |
| tree | e7498f68a15e2e18b8412eefe7f248d379d94d99 /tests/benchmarks/dbus | |
| parent | fa0906bc5664913f232721d611e6e7906892d766 (diff) | |
| parent | 6c6ace9d23f90845fd424e474d38fe30f070775e (diff) | |
Merge remote-tracking branch 'origin/5.10.1' into 5.11
Conflicts:
src/plugins/sqldrivers/psql/qsql_psql.cpp
Change-Id: I070b455078b41e75c46562fcea5676d6218cd00c
Diffstat (limited to 'tests/benchmarks/dbus')
0 files changed, 0 insertions, 0 deletions