diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2020-04-02 15:25:26 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2020-04-27 09:13:30 +0200 |
| commit | e72505b460b143aabcc155301b2afd7eef8d5c7d (patch) | |
| tree | 9bcb6c90cc9339cda86f7d60524e217d393cb078 /src | |
| parent | b3874adb9a928b0cf15a5f8a8ee3103134b02ffc (diff) | |
| download | qtivi-e72505b460b143aabcc155301b2afd7eef8d5c7d.tar.gz | |
Qt6 build fix
Change-Id: I896542c585e6dab9e7658053792f3a686c15fa24
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'src')
4 files changed, 13 insertions, 12 deletions
diff --git a/src/ivicore/qiviabstractfeaturelistmodel.h b/src/ivicore/qiviabstractfeaturelistmodel.h index ee8d621..f789b2f 100644 --- a/src/ivicore/qiviabstractfeaturelistmodel.h +++ b/src/ivicore/qiviabstractfeaturelistmodel.h @@ -44,6 +44,7 @@ #define QIVIABSTRACTFEATURELISTMODEL_H #include <QAbstractListModel> +#include <QtIviCore/QIviServiceObject> #include <QtIviCore/QIviAbstractFeature> QT_BEGIN_NAMESPACE diff --git a/src/plugins/ivimedia/media_simulator/mediaindexerbackend.cpp b/src/plugins/ivimedia/media_simulator/mediaindexerbackend.cpp index 96335c0..fda4170 100644 --- a/src/plugins/ivimedia/media_simulator/mediaindexerbackend.cpp +++ b/src/plugins/ivimedia/media_simulator/mediaindexerbackend.cpp @@ -327,7 +327,7 @@ void MediaIndexerBackend::scanNext() return; ScanData data = m_folderQueue.dequeue(); - m_watcher.setFuture(QtConcurrent::run(this, &MediaIndexerBackend::scanWorker, data)); + m_watcher.setFuture(QtConcurrent::run(&MediaIndexerBackend::scanWorker, this, data)); } void MediaIndexerBackend::setProgress(qreal progress) diff --git a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp index 30ac847..e6e718b 100644 --- a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp +++ b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp @@ -176,9 +176,9 @@ void MediaPlayerBackend::fetchData(const QUuid &identifier, int start, int count QStringList queries; queries.append(queryString); - QtConcurrent::run(m_threadPool, this, + QtConcurrent::run(m_threadPool, &MediaPlayerBackend::doSqlOperation, - MediaPlayerBackend::Select, + this, MediaPlayerBackend::Select, queries, identifier, start, @@ -218,9 +218,9 @@ void MediaPlayerBackend::insert(int index, const QVariant &i) } QStringList queries = queryString.split(';'); - QtConcurrent::run(m_threadPool, this, + QtConcurrent::run(m_threadPool, &MediaPlayerBackend::doSqlOperation, - MediaPlayerBackend::Insert, + this, MediaPlayerBackend::Insert, queries, QUuid(), index, 0); } @@ -231,9 +231,9 @@ void MediaPlayerBackend::remove(int index) .arg(index); QStringList queries = queryString.split(';'); - QtConcurrent::run(m_threadPool, this, + QtConcurrent::run(m_threadPool, &MediaPlayerBackend::doSqlOperation, - MediaPlayerBackend::Remove, + this, MediaPlayerBackend::Remove, queries, QUuid(), index, 1); } @@ -254,9 +254,9 @@ void MediaPlayerBackend::move(int cur_index, int new_index) .arg(delta > 0 ? QStringLiteral("-") : QStringLiteral("+")); QStringList queries = queryString.split(';'); - QtConcurrent::run(m_threadPool, this, + QtConcurrent::run(m_threadPool, &MediaPlayerBackend::doSqlOperation, - MediaPlayerBackend::Move, + this, MediaPlayerBackend::Move, queries, QUuid(), cur_index, new_index); } @@ -434,9 +434,9 @@ void MediaPlayerBackend::setCurrentIndex(int index) QStringList queries; queries.append(queryString); - QtConcurrent::run(m_threadPool, this, + QtConcurrent::run(m_threadPool, &MediaPlayerBackend::doSqlOperation, - MediaPlayerBackend::SetIndex, + this, MediaPlayerBackend::SetIndex, queries, QUuid(), m_currentIndex, 0); } diff --git a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp index c31f327..ae64037 100644 --- a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp +++ b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp @@ -230,8 +230,8 @@ void SearchAndBrowseBackend::fetchData(const QUuid &identifier, int start, int c QString::number(count)); QtConcurrent::run(m_threadPool, - this, &SearchAndBrowseBackend::search, + this, identifier, queryString, current_type, |