summaryrefslogtreecommitdiff
path: root/src/qmltest
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2022-07-16 12:54:54 -0700
committerThiago Macieira <thiago.macieira@intel.com>2022-07-18 08:54:08 -0700
commitfebbd385320ad50d6468c8e1700dbc3e5c7a2053 (patch)
treef218ca20d9e823550ac4ca9107a375745b32797b /src/qmltest
parentf508c48e03fb123d3c8776a1f677627876b6aca2 (diff)
downloadqtdeclarative-febbd385320ad50d6468c8e1700dbc3e5c7a2053.tar.gz
qmltest: use variadic templates instead of QGenericArgument
Change-Id: I36b24183fbd041179f2ffffd170267647be37c52 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qmltest')
-rw-r--r--src/qmltest/quicktest.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index 140a130790..149b8bae3e 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -241,7 +241,8 @@ bool qWaitForSignal(QObject *obj, const char* signal, int timeout = 5000)
return spy.size();
}
-void maybeInvokeSetupMethod(QObject *setupObject, const char *member, QGenericArgument val0 = QGenericArgument(nullptr))
+template <typename... Args>
+void maybeInvokeSetupMethod(QObject *setupObject, const char *member, Args &&... args)
{
// It's OK if it doesn't exist: since we have more than one callback that
// can be called, it makes sense if the user only implements one of them.
@@ -252,7 +253,7 @@ void maybeInvokeSetupMethod(QObject *setupObject, const char *member, QGenericAr
const int methodIndex = setupMetaObject->indexOfMethod(member);
if (methodIndex != -1) {
const QMetaMethod method = setupMetaObject->method(methodIndex);
- method.invoke(setupObject, val0);
+ method.invoke(setupObject, std::forward<Args>(args)...);
}
}