Skip to content

Commit 15648f3

Browse files
committed
try fix qml tests
1 parent 4a91d3a commit 15648f3

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

src/3rdparty/qthttpserver

Submodule qthttpserver updated from b838370 to 92c069d

src/imports/autoupdatercore/qmlautoupdatersingleton.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ QVariant QmlAutoUpdaterSingleton::createInfo(QVariant identifier, QString name,
1515
version.value<QVersionNumber>() :
1616
QVersionNumber::fromString(version.toString()),
1717
std::move(data)
18-
});
18+
});
1919
}
2020

21-
QVariantList QmlAutoUpdaterSingleton::infosAsList(const QList<UpdateInfo> &infos) const
21+
QVariantList QmlAutoUpdaterSingleton::infosAsList(const QVariant &infos) const
2222
{
23+
const auto infoList = infos.value<QList<UpdateInfo>>();
2324
QVariantList l;
24-
l.reserve(infos.size());
25-
for (const auto &info : infos)
25+
l.reserve(infoList.size());
26+
for (const auto &info : infoList)
2627
l.append(QVariant::fromValue(info));
2728
return l;
2829
}

src/imports/autoupdatercore/qmlautoupdatersingleton.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class QmlAutoUpdaterSingleton : public QObject
3434
//! Creates a QtAutoUpdater::UpdateInfo from the given parameters
3535
Q_INVOKABLE QVariant createInfo(QVariant identifier, QString name, const QVariant &version, QVariantMap data = {}) const;
3636
//! Converts a list of QtAutoUpdater::UpdateInfos to a QVariantList, which can be consumed in QML
37-
Q_INVOKABLE QVariantList infosAsList(const QList<QtAutoUpdater::UpdateInfo> &infos) const;
37+
Q_INVOKABLE QVariantList infosAsList(const QVariant &infos) const;
3838

3939

4040
//! @copydoc QtAutoUpdater::Updater::create(const QString &, QObject*)

tests/auto/qml/autoupdatercore/tst_qmlautoupdatercore.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ class Setup : public QObject
99
Q_OBJECT
1010

1111
public:
12-
Q_INVOKABLE QVariant createInfoList(const QtAutoUpdater::UpdateInfo &info)
12+
Q_INVOKABLE QVariant createInfoList(const QVariant &info)
1313
{
14-
return QVariant::fromValue(QList<UpdateInfo>{info});
14+
return QVariant::fromValue(QList<UpdateInfo>{info.value<UpdateInfo>()});
1515
}
1616

1717
public Q_SLOTS:

0 commit comments

Comments
 (0)