diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-04-27 15:40:48 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-04-29 09:47:43 +0200 |
| commit | 0f9abd63b9093f7f9878be697dbda7813201ffcc (patch) | |
| tree | 3fd1f3ae302a7f8cbacc365253e9208d9ac6d8e0 /src/quicktestutils/qml/qmlutils.cpp | |
| parent | c86b340f47d313570ee4b027e247634dcb8d3a02 (diff) | |
| download | qtdeclarative-0f9abd63b9093f7f9878be697dbda7813201ffcc.tar.gz | |
QQmlDataTest: fix dataDirectoryUrl generation for paths in qrc
When the data directory is located in qrc (like on Android), the data
directory url was generated incorrectly, missing the last '/'.
As a result QQmlDataTest::dataDirectoryUrl().resolved("something") call
was providing incorrect results.
This patch fixes it, which allows to unblacklist
tst_qqmlqt::resolvedUrl() for Android.
Task-number: QTBUG-100014
Pick-to: 6.3 6.2
Change-Id: Id336a698b493edaa6e2ab7d36efbbef1f5acd1d6
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quicktestutils/qml/qmlutils.cpp')
| -rw-r--r-- | src/quicktestutils/qml/qmlutils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktestutils/qml/qmlutils.cpp b/src/quicktestutils/qml/qmlutils.cpp index 0a644f727a..5ca9fce281 100644 --- a/src/quicktestutils/qml/qmlutils.cpp +++ b/src/quicktestutils/qml/qmlutils.cpp @@ -46,7 +46,7 @@ QQmlDataTest::QQmlDataTest(const char *qmlTestDataDir) : #endif m_dataDirectoryUrl(m_dataDirectory.startsWith(QLatin1Char(':')) - ? QUrl(QLatin1String("qrc") + m_dataDirectory) + ? QUrl(QLatin1String("qrc") + m_dataDirectory + QLatin1Char('/')) : QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/'))) { m_instance = this; |