2 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro
index 7f75501474..832cfe7ebf 100644
--- a/tests/auto/widgets/kernel/qapplication/test/test.pro
+++ b/tests/auto/widgets/kernel/qapplication/test/test.pro
@@ -7,7 +7,9 @@ QT += core-private gui-private
 SOURCES += ../tst_qapplication.cpp
 TARGET = ../tst_qapplication
 
-TESTDATA = ../test/test.pro ../tmp/README
+builtin_testdata: DEFINES += BUILTIN_TESTDATA
+
+TESTDATA = ../test/test.pro ../tmp/README ../modal
 
 !winrt {
   SUBPROGRAMS = desktopsettingsaware modal
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 5301dababc..3b8aa8f146 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -888,7 +888,11 @@ bool isPathListIncluded(const QStringList &l, const QStringList &r)
 #define QT_TST_QAPP_DEBUG
 void tst_QApplication::libraryPaths()
 {
+#ifndef BUILTIN_TESTDATA
         const QString testDir = QFileInfo(QFINDTESTDATA("test/test.pro")).absolutePath();
+#else
+        const QString testDir = QFileInfo(QFINDTESTDATA("test.pro")).absolutePath();
+#endif
         QVERIFY(!testDir.isEmpty());
     {
         QApplication::setLibraryPaths(QStringList() << testDir);