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>
This commit is contained in:
parent
c86b340f47
commit
0f9abd63b9
|
@ -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;
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# QTBUG-100014
|
||||
[resolvedUrl]
|
||||
android
|
||||
[timeRoundtrip]
|
||||
android
|
||||
|
|
Loading…
Reference in New Issue