diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-08-13 18:26:12 +1000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-18 03:32:41 +0000 |
| commit | 94ab3ae68368d1d60cb6a019a82c0084d2a65d14 (patch) | |
| tree | e938cf4d0d4a2c8cc7d31398b00d806d9fd06489 /tests | |
| parent | 17bea746b4f8215be03c15243a86301f77f782ab (diff) | |
Add NO_RESOURCE_TARGET_PATH option for executable backing targets
For tooling to work when a QML module is associated with an
executable rather than a library, it still needs the standard QML
directory structure in the build directory. But the source tree
is often not structured that way for the .qml files that are part
of the executable's QML module. The NO_RESOURCE_TARGET_PATH option
allows the project to essentially keep the structure from the
source tree in the resources, but use the standard QML structure
in the build directory for tooling.
Task-number: QTBUG-95598
Change-Id: I53145ced0e57d7ea4795bb5260dd464f6458f444
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit f4d5e27080263f7d9b39b73e8415c5e68feb2805)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp index 624cf913cd..f6adfaa943 100644 --- a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp +++ b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp @@ -77,9 +77,9 @@ void tst_basicapp::resourceFiles() void tst_basicapp::fileSystemFiles() { const QString basedir = QCoreApplication::applicationDirPath(); - QVERIFY(QFile::exists(basedir + QStringLiteral("/main.qml"))); - QVERIFY(QFile::exists(basedir + QStringLiteral("/qmldir"))); - QVERIFY(QFile::exists(basedir + QStringLiteral("/tst_qmlbasicapp.qmltypes"))); + QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/main.qml"))); + QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/qmldir"))); + QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/tst_qmlbasicapp.qmltypes"))); QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/Clock.qml"))); QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/center.png"))); @@ -93,7 +93,7 @@ void tst_basicapp::fileSystemFiles() void tst_basicapp::qmldirContents() { { - QFile qmldir(QCoreApplication::applicationDirPath() + "/qmldir"); + QFile qmldir(QCoreApplication::applicationDirPath() + "/BasicApp/qmldir"); QVERIFY(qmldir.open(QIODevice::ReadOnly)); const QByteArray contents = qmldir.readAll(); QVERIFY(contents.contains("module BasicApp")); |