path: root/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro
diff options
authorMitch Curtis <mitch.curtis@qt.io>2017-12-12 11:16:45 +0100
committerMitch Curtis <mitch.curtis@qt.io>2018-01-04 08:15:44 +0000
commit8836896dff45fe1d21736835845e36d03763117f (patch)
treebd6632084d2ff1d05d689a7e39d8f75b0a9f83f9 /tests/auto/qml/qqmlcomponent/qqmlcomponent.pro
parent0dbdfaa78d9c3ac0c1a9cfff440d753b159a3a14 (diff)
Allow QQmlComponent::loadUrl() to load absolute URLs with relative paths
Currently, QQmlTypeLoader::getType() will assert if passed a relative URL, because it needs absolute URLs in order to ensure that it can use them as keys for its cache. After dc6b73390 was merged, URLs like QUrl::fromLocalFile("main.qml") (which are currently used in examples of how to load a QQmlComponent) started causing the assertion to fail. As mentioned in the comments of the bug report, some patches have already been applied to QQmlComponent's QString-based constructors, but both the constructors taking a QUrl and loadUrl() itself need fixing. This patch puts the fix into loadUrl() (the constructors call this function) so that every operation involving URLs is successful when using the documented methods. Task-number: QTBUG-58837 Change-Id: Ib54ca52eddce6e7781cf96015f4c15af604233d3 Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'tests/auto/qml/qqmlcomponent/qqmlcomponent.pro')
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro b/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro
index 9f8c8a4e24..0d501ebefd 100644
--- a/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro
+++ b/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro
@@ -8,6 +8,8 @@ SOURCES += tst_qqmlcomponent.cpp \
HEADERS += ../../shared/testhttpserver.h
+RESOURCES += data/QtObjectComponent.qml
include (../../shared/util.pri)
TESTDATA = data/*