diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2016-03-04 22:05:01 +0100 |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2016-03-13 22:15:47 +0000 |
| commit | c738e637b8b976d870c08619dd1201cf8b143efb (patch) | |
| tree | 379c25309e93f569033c9ad75df83a96f560972a /src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch | |
| parent | 59a3ca679ede2cb9b6a162edf8eba5cf6d9af4a9 (diff) | |
update bundled sqlite to 3.11.1.0
Since Qt 5.7 has dropped WinCE, including WEC2013, the patch for WinCE
is no longer needed.
The source code for the sqlite3 shell, shell.c, is not required for
building the qsqlite driver or anything else in Qt, so there is no
reason to keep bundling it with Qt sources.
Change-Id: Id0b03945451f9e843a0424c9fe510d79555717fc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Gunnar Roth <gunnar.roth@gmx.net>
Diffstat (limited to 'src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch')
| -rw-r--r-- | src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch b/src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch deleted file mode 100644 index 43e61cba12..0000000000 --- a/src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 448df48c1610745cad734df210aa2f21f26c9ae4 Mon Sep 17 00:00:00 2001 -From: Gunnar Roth <gunnar.roth@gmx.net> -Date: Fri, 22 Jan 2016 22:38:17 +0100 -Subject: [PATCH] Fixing the SQLite3 build for WEC2013 again. - -The new version broke the build again --> fix it again. - -Change-Id: I75761d134d97a2784f1de5076412aa814fdf9bcd - -diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c -index c0ab233..b397726 100644 ---- a/src/3rdparty/sqlite/sqlite3.c -+++ b/src/3rdparty/sqlite/sqlite3.c -@@ -16867,6 +16867,13 @@ static void clearYMD_HMS_TZ(DateTime *p){ - #define HAVE_LOCALTIME_S 1 - #endif - -+#if defined(_WIN32_WCE) && _WIN32_WCE < 0x800 -+#undef HAVE_LOCALTIME_S -+struct tm *__cdecl localtime(const time_t *t); -+#elif defined(_WIN32_WCE) && _WIN32_WCE >= 0x800 -+#define SQLITE_MSVC_LOCALTIME_API 1 -+#endif -+ - #ifndef SQLITE_OMIT_LOCALTIME - /* - ** The following routine implements the rough equivalent of localtime_r() --- -2.5.0 - |