summaryrefslogtreecommitdiffstats
path: root/src/library
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2021-10-12 20:20:43 +0200
committerGitHub <noreply@github.com>2021-10-12 20:20:43 +0200
commit58572fb6c0e87c59a34c57944126bd8d521a2ea4 (patch)
tree89456769933c225433b60ff35a008f386b5ab1b8 /src/library
parent161775dae06f0ee95285351abcd94f32c85d13b9 (diff)
parent079f7cd5e5e1c05bf8b2ff4e2f577a6801d3a9cf (diff)
Merge pull request #4376 from Be-ing/qsqlfield_qmetatype
Qt6: use new QSqlField constructor with QMetaType
Diffstat (limited to 'src/library')
-rw-r--r--src/library/queryutil.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/library/queryutil.h b/src/library/queryutil.h
index 7c22376d8d..0abb0220bc 100644
--- a/src/library/queryutil.h
+++ b/src/library/queryutil.h
@@ -74,7 +74,13 @@ class FieldEscaper final {
public:
FieldEscaper(const QSqlDatabase& database)
: m_database(database),
- m_stringField("string", QVariant::String) {
+ m_stringField("string",
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ QMetaType(QMetaType::QString)
+#else
+ QVariant::String
+#endif
+ ) {
}
// Escapes a string for use in a SQL query by wrapping with quotes and