diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-05 17:58:48 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-05 18:02:18 +0100 |
commit | a7e4b645dc5b164eb31c22b558ae7a2f5b674afb (patch) | |
tree | c58ac922346363c265ad6873cefe9ed205d84a1d /src/3rdparty/sqlite/qt_attribution.json | |
parent | cd542a82b0c2d5c9a4ea167a84e5ea8a25c5d969 (diff) | |
parent | ea0e868c4881944207e9b3a77011e05a505ff3b7 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/corelib/global/minimum-linux.S
src/network/access/qhttpthreaddelegate.cpp
src/widgets/kernel/qwidgetwindow.cpp
Change-Id: Id2e817e85f85c68f5482c9a12912d35590f9d5f8
Diffstat (limited to 'src/3rdparty/sqlite/qt_attribution.json')
-rw-r--r-- | src/3rdparty/sqlite/qt_attribution.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/sqlite/qt_attribution.json b/src/3rdparty/sqlite/qt_attribution.json index 1f91bb180f..50c179bf6e 100644 --- a/src/3rdparty/sqlite/qt_attribution.json +++ b/src/3rdparty/sqlite/qt_attribution.json @@ -6,7 +6,7 @@ "Description": "SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine.", "Homepage": "http://www.sqlite.org/", - "Version": "3.16.2", + "Version": "3.20.1", "License": "Public Domain", "Copyright": "The authors disclaim copyright to the source code. However, a license can be obtained if needed." } |