Skip to content

Commit 85bdf3b

Browse files
committed
try fix remaining errors
1 parent 0aa8837 commit 85bdf3b

File tree

6 files changed

+9
-14
lines changed

6 files changed

+9
-14
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,16 @@ jobs:
8787
install-args: --verbose
8888
cachedir: qt/${{matrix.version}}/${{matrix.platform}}
8989
- name: build qthttpserver
90-
# if: steps.cache-qt.outputs.cache-hit != 'true' && !contains(matrix.platform, 'mingw')
91-
if: steps.cache-qt.outputs.cache-hit != 'true'
90+
if: steps.cache-qt.outputs.cache-hit != 'true' && !contains(matrix.platform, 'mingw')
9291
run: |
9392
qmake
9493
${{steps.qt.outputs.make}} qmake_all
9594
${{steps.qt.outputs.make}}
9695
${{steps.qt.outputs.make}} install
9796
working-directory: src/3rdparty/qthttpserver
98-
# - name: unpack qthttpserver
99-
# if: steps.cache-qt.outputs.cache-hit != 'true' && contains(matrix.platform, 'mingw')
100-
# run: 7z x "src/3rdparty/qthttpserver-${{matrix.platform}}.zip" "-o${{steps.qt.outputs.qtdir}}" -aoa -y
97+
- name: unpack qthttpserver
98+
if: steps.cache-qt.outputs.cache-hit != 'true' && contains(matrix.platform, 'mingw')
99+
run: 7z x "src/3rdparty/qthttpserver-${{matrix.platform}}.zip" "-o${{steps.qt.outputs.qtdir}}" -aoa -y
101100
- name: install packagekit
102101
if: matrix.platform == 'gcc_64'
103102
run: |
2.31 MB
Binary file not shown.
2.32 MB
Binary file not shown.

src/imports/autoupdatercore/qmlautoupdatersingleton.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@ QVariant QmlAutoUpdaterSingleton::createInfo(QVariant identifier, QString name,
1818
});
1919
}
2020

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

3126
Updater *QmlAutoUpdaterSingleton::createUpdater(const QString &configPath, QObject *parent) const

src/imports/autoupdatercore/qmlautoupdatersingleton.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <QtAutoUpdaterCore/Updater>
1010
#include <QtAutoUpdaterCore/UpdaterBackend>
1111

12+
#include <QtQml/QJSValue>
1213

1314
#ifdef DOXYGEN_RUN
1415
namespace de::skycoder42::QtAutoUpdater::Core {
@@ -34,7 +35,7 @@ class QmlAutoUpdaterSingleton : public QObject
3435
//! Creates a QtAutoUpdater::UpdateInfo from the given parameters
3536
Q_INVOKABLE QVariant createInfo(QVariant identifier, QString name, const QVariant &version, QVariantMap data = {}) const;
3637
//! Converts a list of QtAutoUpdater::UpdateInfos to a QVariantList, which can be consumed in QML
37-
Q_INVOKABLE QVariantList infosAsList(const QVariant &infos) const;
38+
Q_INVOKABLE Q_DECL_DEPRECATED QJSValue infosAsList(const QJSValue &value) const;
3839

3940

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

tests/auto/qml/autoupdatercore/tst_qmlautoupdatercore.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Item {
3434
key: "value"
3535
});
3636
let tList = setup.createInfoList(info);
37-
let resList = QtAutoUpdater.infosAsList(tList);
37+
let resList = QtAutoUpdater.infosAsList(tList); // TODO remove deprecated
3838
compare(resList.length, 1);
3939
compare(resList[0], info);
4040
}

0 commit comments

Comments
 (0)