diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-07 14:45:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-07 14:47:19 +0100 |
| commit | 24fba6744cea1163ceee06d69d31b4eb619cd386 (patch) | |
| tree | 87850fde25ac7ac662de366e3ce3be91061245ce /src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | |
| parent | 0749ba2c5eacc4822cf9c7a31edf8d70c4ef6064 (diff) | |
| parent | 1c8224511dee2794553da9dc8ed484d49dc78b45 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
Change-Id: Ib6dd965a7eb6f59103e276b3407739147ecd37b2
Diffstat (limited to 'src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp')
0 files changed, 0 insertions, 0 deletions