poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

core/intercept: do not rewrite paths when url ends in .qml

Browse source 
Fixes component baseUrls becoming file:// paths which cannot access singletons.
This commit is contained in:
outfoxxed 2024-04-30 23:11:54 -07:00
parent 53d69fd2c0
commit d64bf59bb0
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/qsintercept.cpp
View file

@ -20,6 +20,11 @@ QUrl QsUrlInterceptor::intercept(const QUrl& url, QQmlAbstractUrlInterceptor::Da
// Some types such as Image take into account where they are loading from, and force // Some types such as Image take into account where they are loading from, and force
// asynchronous loading over a network. qsintercept is considered to be over a network. // asynchronous loading over a network. qsintercept is considered to be over a network.
if (type == QQmlAbstractUrlInterceptor::DataType::UrlString && url.scheme() == "qsintercept") { if (type == QQmlAbstractUrlInterceptor::DataType::UrlString && url.scheme() == "qsintercept") {
// Qt.resolvedUrl and context->resolvedUrl can use this on qml files, in which
// case we want to keep the intercept, otherwise objects created from those paths
// will not be able to use singletons.
if (url.path().endsWith(".qml")) return url;
auto newUrl = url; auto newUrl = url;
newUrl.setScheme("file"); newUrl.setScheme("file");
qCDebug(logQsIntercept) << "Rewrote intercept" << url << "to" << newUrl; qCDebug(logQsIntercept) << "Rewrote intercept" << url << "to" << newUrl;