From 4e7041c65216ada4f5fb604a9df840152ba60317 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 8 Feb 2017 15:08:53 +0100 Subject: pointer handlers manual test: can give arg with qml to launch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it easier to repeatedly launch the same test: specify the qml file on the command line instead of having to click the list item each time. e.g. ./pointer tapHandler.qml Change-Id: I30b449b161107b1746418fc45518d202ba7d8381 Reviewed-by: Jan Arve Sæther --- tests/manual/pointer/main.cpp | 15 +++++++++++++++ tests/manual/pointer/main.qml | 1 + 2 files changed, 16 insertions(+) (limited to 'tests') diff --git a/tests/manual/pointer/main.cpp b/tests/manual/pointer/main.cpp index a4e1060cf5..7935b4072c 100644 --- a/tests/manual/pointer/main.cpp +++ b/tests/manual/pointer/main.cpp @@ -39,6 +39,8 @@ ****************************************************************************/ #include #include +#include +#include int main(int argc, char *argv[]) { @@ -46,6 +48,19 @@ int main(int argc, char *argv[]) QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + if (!app.arguments().isEmpty()) { + QQuickWindow * win = static_cast(engine.rootObjects().first()); + auto lastArg = app.arguments().last(); + if (lastArg.endsWith(QLatin1String(".qml"))) { + auto root = win->findChild("LauncherList"); + int showExampleIdx = -1; + for (int i = root->metaObject()->methodCount(); showExampleIdx < 0 && i >= 0; --i) + if (root->metaObject()->method(i).name() == QByteArray("showExample")) + showExampleIdx = i; + QMetaMethod showExampleFn = root->metaObject()->method(showExampleIdx); + showExampleFn.invoke(root, Q_ARG(QVariant, QVariant(QLatin1String("../../") + lastArg))); + } + } return app.exec(); } diff --git a/tests/manual/pointer/main.qml b/tests/manual/pointer/main.qml index a71490d23b..e60edd06ce 100644 --- a/tests/manual/pointer/main.qml +++ b/tests/manual/pointer/main.qml @@ -48,6 +48,7 @@ Window { visible: true Examples.LauncherList { id: ll + objectName: "LauncherList" anchors.fill: parent Component.onCompleted: { addExample("single point handler", "QQuickPointerSingleHandler: test properties copied from events", Qt.resolvedUrl("singlePointHandlerProperties.qml")) -- cgit v1.2.3