diff options
author | Dominik Holland <dominik.holland@qt.io> | 2021-05-31 13:03:13 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@qt.io> | 2021-06-02 22:14:42 +0200 |
commit | 96cf2fd294c6d990cbbc286e83e1db51ac36ea6a (patch) | |
tree | fc1badfe8b8fe03e43914f3b3ff540bf6791e719 /src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp | |
parent | 6708c9ca5a282b1f830239d39be95efbab451ab8 (diff) | |
download | qtivi-96cf2fd294c6d990cbbc286e83e1db51ac36ea6a.tar.gz |
Enable building with the new QtMultimedia module
Change-Id: I625d9ce22823b96f6750a7a3e05c112187b5c19a
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp')
-rw-r--r-- | src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp index e23843d..57abaeb 100644 --- a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp +++ b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp @@ -207,7 +207,8 @@ void SearchAndBrowseBackend::fetchData(const QUuid &identifier, int start, int c whereClause.isEmpty() ? QString() : QStringLiteral("WHERE ") + whereClause, groupBy.isEmpty() ? QString() : QStringLiteral("GROUP BY ") + groupBy); - QtConcurrent::run(m_threadPool, [this, countQuery, identifier]() { + // QtConcurrent::run doesn't allow ignoring the return value + auto future = QtConcurrent::run(m_threadPool, [this, countQuery, identifier]() { QSqlQuery query(m_db); if (query.exec(countQuery)) { while (query.next()) { @@ -226,7 +227,8 @@ void SearchAndBrowseBackend::fetchData(const QUuid &identifier, int start, int c QString::number(start), QString::number(count)); - QtConcurrent::run(m_threadPool, + // QtConcurrent::run doesn't allow ignoring the return value + future = QtConcurrent::run(m_threadPool, &SearchAndBrowseBackend::search, this, identifier, @@ -372,7 +374,7 @@ QString SearchAndBrowseBackend::createWhereClause(const QString &type, QIviAbstr QString operatorString; bool negated = filter->isNegated(); QString value; - if (filter->value().type() == QVariant::String) + if (filter->value().typeId() == QMetaType::QString) value = QStringLiteral("'%1'").arg(filter->value().toString().replace('*', '%')); else value = filter->value().toString(); |