From 38a5f0218bbf33c42e65a8cfca5342ef5234c5a8 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 16 Oct 2021 15:46:21 -0500 Subject: BaseTrackTableModel: fix Qt6 QVariant deprecation warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ../src/library/basetracktablemodel.cpp: In member function ‘QVariant BaseTrackTableModel::roleValue(const QModelIndex&, QVariant&&, int) const’: ../src/library/basetracktablemodel.cpp:649:30: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 649 | if (rawValue.type() == QVariant::String) { | ~~~~~~~~~~~~~^~ In file included from /usr/include/qt6/QtCore/qabstractitemmodel.h:47, from /usr/include/qt6/QtCore/QAbstractTableModel:1, from ../src/library/basetracktablemodel.h:3, from ../src/library/basetracktablemodel.cpp:1: /usr/include/qt6/QtCore/qvariant.h:337:10: note: declared here 337 | Type type() const | ^~~~ --- src/library/basetracktablemodel.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/library') diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp index 4255e906a8..1262856389 100644 --- a/src/library/basetracktablemodel.cpp +++ b/src/library/basetracktablemodel.cpp @@ -646,7 +646,11 @@ QVariant BaseTrackTableModel::roleValue( } case ColumnCache::COLUMN_LIBRARYTABLE_LAST_PLAYED_AT: { QDateTime lastPlayedAt; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + if (rawValue.metaType().id() == QMetaType::QString) { +#else if (rawValue.type() == QVariant::String) { +#endif // column value lastPlayedAt = mixxx::sqlite::readGeneratedTimestamp(rawValue); } else { -- cgit v1.2.3