diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-18 09:26:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-02-18 09:26:53 +0100 |
| commit | b9585277e78f0571933706507ba2024c68d6df19 (patch) | |
| tree | c98577aae762b75d0ac6437c1ec68da0ddb4426b /src/plugins/sqldrivers/odbc | |
| parent | eb2af9d923923255b276c6549ada1ed7839d5dd8 (diff) | |
| parent | d7b6c4288f2de8b0123c888e83a3fbcd84ed906f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/tools/qlinkedlist.h
src/plugins/platforms/wasm/qwasmintegration.cpp
src/plugins/platforms/wasm/qwasmscreen.cpp
Change-Id: Iefca7f9f4966bdc20e7052aca736874861055738
Diffstat (limited to 'src/plugins/sqldrivers/odbc')
0 files changed, 0 insertions, 0 deletions