From b4682b31df4abf8a3230f78170301e5a2957bb68 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Thu, 26 Apr 2018 23:53:11 -0700 Subject: [PATCH] Getting the variant list out to js right --- libraries/workload/src/workload/ViewTask.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libraries/workload/src/workload/ViewTask.h b/libraries/workload/src/workload/ViewTask.h index e226c70d09..481d833a0b 100644 --- a/libraries/workload/src/workload/ViewTask.h +++ b/libraries/workload/src/workload/ViewTask.h @@ -13,6 +13,16 @@ #include "Engine.h" +template +QVariantList toVariantList(const QList &list) +{ + QVariantList newList; + foreach(const T &item, list) + newList << item; + + return newList; +} + namespace workload { class SetupViewsConfig : public Job::Config{ Q_OBJECT @@ -174,14 +184,14 @@ namespace workload { static const int SIZE{ workload::Region::NUM_VIEW_REGIONS }; float timings[SIZE]; glm::vec2 ranges[SIZE]; - QVector _timings { 6, 2.0 }; + QList _timings { 6, 2.0 }; } dataExport; void emitDirty() { emit dirty(); } public slots: - Q_INVOKABLE QVector getTimings() const { return dataExport._timings; } + Q_INVOKABLE QVariantList getTimings() const { return toVariantList(dataExport._timings); } signals: void dirty(); };