aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2023-11-16 14:10:58 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2023-11-16 14:10:58 +0200
commitc020bda61fe4a8108772309561d1f8e2f089aec0 (patch)
treedf359d135bc5f6a0dc32d0576e651c45adf50f4d
parent684f075917454a762e2dea5308945c3f0cd1887d (diff)
Deal with QVector being alias for QList in Qt 6HEADmaster
-rw-r--r--odb/qt/containers/qvector-traits.hxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/odb/qt/containers/qvector-traits.hxx b/odb/qt/containers/qvector-traits.hxx
index e3905f7..516475d 100644
--- a/odb/qt/containers/qvector-traits.hxx
+++ b/odb/qt/containers/qvector-traits.hxx
@@ -6,6 +6,14 @@
#include <odb/pre.hxx>
+#include <QtCore/QtGlobal> // QT_VERSION
+
+// In Qt 6 QVector is an alias for QList.
+//
+#if QT_VERSION >= 0x060000
+#include <odb/qt/containers/qlist-traits.hxx>
+#else
+
#include <QtCore/QVector>
#include <odb/container-traits.hxx>
@@ -67,6 +75,8 @@ namespace odb
};
}
+#endif
+
#include <odb/post.hxx>
#endif // ODB_QT_CONTAINER_QVECTOR_TRAITS_HXX