Make qmlplugindump work in shadow builds

QQmlDataTest has provisions for looking up the data files in the right
place. Use that.

Change-Id: I3ec8d75efc0e66980986192e87e5ac52bc1119df
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

4 files changed, 9 insertions, 4 deletions

diff --git a/tests/auto/qml/qmlplugindump/tests/dumper/CompositeSingleton/Singleton.qml b/tests/auto/qml/qmlplugindump/data/dumper/CompositeSingleton/Singleton.qml
index b47d2e98f4..b47d2e98f4 100644
--- a/tests/auto/qml/qmlplugindump/tests/dumper/CompositeSingleton/Singleton.qml
+++ b/tests/auto/qml/qmlplugindump/data/dumper/CompositeSingleton/Singleton.qml
diff --git a/tests/auto/qml/qmlplugindump/tests/dumper/CompositeSingleton/qmldir b/tests/auto/qml/qmlplugindump/data/dumper/CompositeSingleton/qmldir
index 8df57f6d47..8df57f6d47 100644
--- a/tests/auto/qml/qmlplugindump/tests/dumper/CompositeSingleton/qmldir
+++ b/tests/auto/qml/qmlplugindump/data/dumper/CompositeSingleton/qmldir
diff --git a/tests/auto/qml/qmlplugindump/qmlplugindump.pro b/tests/auto/qml/qmlplugindump/qmlplugindump.pro
index c713edc541..76f3fe2299 100644
--- a/tests/auto/qml/qmlplugindump/qmlplugindump.pro
+++ b/tests/auto/qml/qmlplugindump/qmlplugindump.pro
@@ -1,6 +1,8 @@
 CONFIG += testcase
 TARGET = tst_qmlplugindump
-QT += testlib gui-private
+QT += testlib gui-private qml
 macx:CONFIG -= app_bundle
 
+include(../../shared/util.pri)
+
 SOURCES += tst_qmlplugindump.cpp
diff --git a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
index 68e11e3551..6915e789c6 100644
--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
@@ -26,6 +26,8 @@
 **
 ****************************************************************************/
 
+#include "util.h"
+
 #include <qtest.h>
 #include <QLibraryInfo>
 #include <QDir>
@@ -33,7 +35,7 @@
 #include <QDebug>
 #include <cstdlib>
 
-class tst_qmlplugindump : public QObject
+class tst_qmlplugindump : public QQmlDataTest
 {
     Q_OBJECT
 public:
@@ -54,6 +56,7 @@ tst_qmlplugindump::tst_qmlplugindump()
 
 void tst_qmlplugindump::initTestCase()
 {
+    QQmlDataTest::initTestCase();
     qmlplugindumpPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
 
 #if defined(Q_OS_WIN)
@@ -102,8 +105,8 @@ void tst_qmlplugindump::singleton()
 {
     QProcess dumper;
     QStringList args;
-    args << QLatin1String("tests.dumper.CompositeSingleton") << QLatin1String("1.0")
-         << QLatin1String(".");
+    args << QLatin1String("dumper.CompositeSingleton") << QLatin1String("1.0")
+         << testFile(".");
     dumper.start(qmlplugindumpPath, args);
     QVERIFY2(dumper.waitForStarted(), qPrintable(dumper.errorString()));
     QVERIFY2(dumper.waitForFinished(), qPrintable(dumper.errorString()));