Revert "qtbase: fix build with kirkstone"

This reverts commit fd946afc0a.
Fix was merged in qtbase.

Change-Id: I16c05ad1f681a8a92b83c2bad6aa69de8ab2e35f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2023-09-26 11:27:39 +00:00
parent add471f503
commit 12b1d381ea
2 changed files with 0 additions and 29 deletions

View File

@ -1,28 +0,0 @@
From f64c3d9b648cdc8d48a9aea475f4bad28d863518 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 18 Aug 2023 08:18:58 +0300
Subject: [PATCH] QtVFS: fix build with sqlite version < 3.40
sqlite3_filename typedef was introduced in sqlite v3.40 (2022-11-16).
Add typedef to work with older versions.
Change-Id: I80b5ed42c03eb962a86bbab53591c84e006d2c44
Upstream-Status: Submitted
---
src/plugins/sqldrivers/sqlite/qsql_sqlite_vfs.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite_vfs.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite_vfs.cpp
index e6e5789939..c5bf720b34 100644
--- a/src/plugins/sqldrivers/sqlite/qsql_sqlite_vfs.cpp
+++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite_vfs.cpp
@@ -9,6 +9,9 @@
#include <sqlite3.h>
#include <stdio.h> // defines FILENAME_MAX everywhere
+// needed for sqlite < 3.40
+typedef const char *sqlite3_filename;
+
#ifndef PATH_MAX
# define PATH_MAX FILENAME_MAX
#endif

View File

@ -22,7 +22,6 @@ SRC_URI += "\
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \
file://0005-testlib-don-t-track-the-build-or-source-directories.patch \
file://0006-QtVFS-fix-build-with-sqlite-version-3.40.patch \
"
DEPENDS += "\