diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-05-07 09:19:39 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-05-07 09:07:40 +0000 |
| commit | bf5b1d714c6eeb9a82fbf046ae18c1e63cfe6a20 (patch) | |
| tree | b8eb5867c9b690fa1d92e6285f6fc5c354e41faf /src/libs/sqlite/sqlitesessionchangeset.cpp | |
| parent | 635993fbdcda6b2c9711b3f74511e8fd94cb07f3 (diff) | |
Revert "Revert "Merge remote-tracking branch 'origin/4.15'""
This reverts commit f0a86d45104f585b7aeef07fcc68cea24061aedb.
Reverting a merge doesn't "undo" it - the changes would be lost
forever even with subsequent merges.
So we need to revert the revert to get the changes.
Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/libs/sqlite/sqlitesessionchangeset.cpp')
| -rw-r--r-- | src/libs/sqlite/sqlitesessionchangeset.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/sqlite/sqlitesessionchangeset.cpp b/src/libs/sqlite/sqlitesessionchangeset.cpp index 76fc088f92f..eef98bc5d57 100644 --- a/src/libs/sqlite/sqlitesessionchangeset.cpp +++ b/src/libs/sqlite/sqlitesessionchangeset.cpp @@ -29,7 +29,7 @@ #include <utils/smallstringio.h> -#include <sqlite3ext.h> +#include <sqlite.h> namespace Sqlite { |