diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-15 17:53:16 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-22 18:37:52 +0200 |
commit | 0a1e4cc7ec7548f6273befff9cdddb0bc7a58961 (patch) | |
tree | bf8b7ae725ac332fa59bd9058cc479018aca147d /src | |
parent | 4e266103ad8b75d71fb176a2f774faf71997123d (diff) |
Do not resolve URLs when assigning them to a property
We don't know in advance if a URL is part of the source code and should
be relative to the current element, or if it is part of the application
data and should not be touched.
[ChangeLog][QtQml][Important Behavior Changes] URLs are not resolved or
intercepted anymore when assigning them to a "url" property. Instead
they are resolved and possibly intercepted when used to access an actual
resource.
Fixes: QTBUG-76879
Change-Id: Iaa2385aff2c13aa71a12e57385d9afb5dc60a073
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/particles/qquickimageparticle.cpp | 19 | ||||
-rw-r--r-- | src/particles/qquickmaskextruder.cpp | 6 | ||||
-rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 11 | ||||
-rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 19 | ||||
-rw-r--r-- | src/qml/qml/qqmlproperty_p.h | 3 | ||||
-rw-r--r-- | src/qmlworkerscript/qquickworkerscript.cpp | 11 | ||||
-rw-r--r-- | src/quick/items/qquickanimatedimage.cpp | 10 | ||||
-rw-r--r-- | src/quick/items/qquickborderimage.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquickimagebase.cpp | 8 | ||||
-rw-r--r-- | src/quick/items/qquickloader.cpp | 21 | ||||
-rw-r--r-- | src/quick/items/qquickloader_p_p.h | 1 | ||||
-rw-r--r-- | src/quick/items/qquicksprite.cpp | 13 | ||||
-rw-r--r-- | src/quick/items/qquicktext.cpp | 8 | ||||
-rw-r--r-- | src/quick/items/qquicktextedit.cpp | 4 | ||||
-rw-r--r-- | src/quick/util/qquickfontloader.cpp | 26 |
16 files changed, 97 insertions, 69 deletions
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index 05c21ecf56..29eb9ecdf2 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -1169,22 +1169,33 @@ bool QQuickImageParticle::loadingSomething() void QQuickImageParticle::mainThreadFetchImageData() { + const QQmlContext *context = nullptr; + QQmlEngine *engine = nullptr; + const auto loadPix = [&](ImageData *image) { + if (!engine) { + context = qmlContext(this); + engine = context->engine(); + } + image->pix.load(engine, context->resolvedUrl(image->source)); + }; + + if (m_image) {//ImageData created on setSource m_image->pix.clear(this); - m_image->pix.load(qmlEngine(this), m_image->source); + loadPix(m_image.get()); } if (m_spriteEngine) m_spriteEngine->startAssemblingImage(); if (m_colorTable) - m_colorTable->pix.load(qmlEngine(this), m_colorTable->source); + loadPix(m_colorTable.get()); if (m_sizeTable) - m_sizeTable->pix.load(qmlEngine(this), m_sizeTable->source); + loadPix(m_sizeTable.get()); if (m_opacityTable) - m_opacityTable->pix.load(qmlEngine(this), m_opacityTable->source); + loadPix(m_opacityTable.get()); m_startedImageLoading = 2; } diff --git a/src/particles/qquickmaskextruder.cpp b/src/particles/qquickmaskextruder.cpp index 2ce3650743..61f9092f0a 100644 --- a/src/particles/qquickmaskextruder.cpp +++ b/src/particles/qquickmaskextruder.cpp @@ -40,9 +40,12 @@ #include "qquickmaskextruder_p.h" #include <QtQml/qqml.h> #include <QtQml/qqmlinfo.h> +#include <QtQml/qqmlcontext.h> + #include <QImage> #include <QDebug> #include <QRandomGenerator> + QT_BEGIN_NAMESPACE /*! \qmltype MaskShape @@ -85,7 +88,8 @@ void QQuickMaskExtruder::startMaskLoading() m_pix.clear(this); if (m_source.isEmpty()) return; - m_pix.load(qmlEngine(this), m_source); + const QQmlContext *context = qmlContext(this); + m_pix.load(context->engine(), context->resolvedUrl(m_source)); if (m_pix.isLoading()) m_pix.connectFinished(this, SLOT(finishMaskLoading())); else diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 19d7a4f736..cdfbad2a35 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -426,7 +426,7 @@ Q_NEVER_INLINE bool QQmlBinding::slowWrite(const QQmlPropertyData &core, } else if (result.isNull() && core.isQObject()) { value = QVariant::fromValue((QObject *)nullptr); } else if (core.propType() == qMetaTypeId<QList<QUrl> >()) { - value = QQmlPropertyPrivate::resolvedUrlSequence(v4engine->toVariant(result, qMetaTypeId<QList<QUrl> >()), context()); + value = QQmlPropertyPrivate::urlSequence(v4engine->toVariant(result, qMetaTypeId<QList<QUrl>>())); } else if (!isVarProperty && type != qMetaTypeId<QJSValue>()) { value = v4engine->toVariant(result, type); } diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index 61d287fc88..19ec8d95de 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -452,10 +452,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const case QMetaType::QUrl: { assertType(QV4::CompiledData::Binding::Type_String); const QString string = compilationUnit->bindingValueAsString(binding); - QUrl value = string.isEmpty() ? QUrl() - : compilationUnit->finalUrl().resolved(QUrl(string)); - // Apply URL interceptor - value = engine->interceptUrl(value, QQmlAbstractUrlInterceptor::UrlString); + QUrl value(string); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; @@ -646,11 +643,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const break; } else if (property->propType() == qMetaTypeId<QList<QUrl> >()) { assertType(QV4::CompiledData::Binding::Type_String); - QString urlString = compilationUnit->bindingValueAsString(binding); - QUrl u = urlString.isEmpty() ? QUrl() - : compilationUnit->finalUrl().resolved(QUrl(urlString)); - QList<QUrl> value; - value.append(u); + QList<QUrl> value { QUrl(compilationUnit->bindingValueAsString(binding)) }; property->writeProperty(_qobject, &value, propertyWriteFlags); break; } else if (property->propType() == qMetaTypeId<QList<QString> >()) { diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index adfa76ea24..5a2c87f221 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -1100,8 +1100,7 @@ QVariant QQmlPropertyPrivate::readValueProperty() } // helper function to allow assignment / binding to QList<QUrl> properties. -QVariant QQmlPropertyPrivate::resolvedUrlSequence( - const QVariant &value, const QQmlRefPointer<QQmlContextData> &context) +QVariant QQmlPropertyPrivate::urlSequence(const QVariant &value) { QList<QUrl> urls; if (value.userType() == qMetaTypeId<QUrl>()) { @@ -1126,17 +1125,7 @@ QVariant QQmlPropertyPrivate::resolvedUrlSequence( urls.append(QUrl(urlStrings.at(i))); } // note: QList<QByteArray> is not currently supported. - QList<QUrl> resolvedUrls; - const int urlsSize = urls.size(); - resolvedUrls.reserve(urlsSize); - for (int i = 0; i < urlsSize; ++i) { - QUrl u = urls.at(i); - if (context && u.isRelative() && !u.isEmpty()) - u = context->resolvedUrl(u); - resolvedUrls.append(u); - } - - return QVariant::fromValue<QList<QUrl> >(resolvedUrls); + return QVariant::fromValue<QList<QUrl> >(urls); } //writeEnumProperty MIRRORS the relelvant bit of QMetaProperty::write AND MUST BE KEPT IN SYNC! @@ -1318,11 +1307,9 @@ bool QQmlPropertyPrivate::write( else return false; - if (context && u.isRelative() && !u.isEmpty()) - u = context->resolvedUrl(u); return property.writeProperty(object, &u, flags); } else if (propertyType == qMetaTypeId<QList<QUrl>>()) { - QList<QUrl> urlSeq = resolvedUrlSequence(value, context).value<QList<QUrl>>(); + QList<QUrl> urlSeq = urlSequence(value).value<QList<QUrl>>(); return property.writeProperty(object, &urlSeq, flags); } else if (property.isQList()) { QQmlMetaObject listType; diff --git a/src/qml/qml/qqmlproperty_p.h b/src/qml/qml/qqmlproperty_p.h index 5e357d77c0..f8315854f7 100644 --- a/src/qml/qml/qqmlproperty_p.h +++ b/src/qml/qml/qqmlproperty_p.h @@ -150,8 +150,7 @@ public: int type = 0, int *types = nullptr); static void flushSignal(const QObject *sender, int signal_index); - static QVariant resolvedUrlSequence( - const QVariant &value, const QQmlRefPointer<QQmlContextData> &context); + static QVariant urlSequence(const QVariant &value); static QQmlProperty create( QObject *target, const QString &propertyName, const QQmlRefPointer<QQmlContextData> &context); diff --git a/src/qmlworkerscript/qquickworkerscript.cpp b/src/qmlworkerscript/qquickworkerscript.cpp index 3c8d9d15d6..a5d2fe6e87 100644 --- a/src/qmlworkerscript/qquickworkerscript.cpp +++ b/src/qmlworkerscript/qquickworkerscript.cpp @@ -553,8 +553,10 @@ void QQuickWorkerScript::setSource(const QUrl &source) m_source = source; - if (engine()) - m_engine->executeUrl(m_scriptId, m_source); + if (engine()) { + const QQmlContext *context = qmlContext(this); + m_engine->executeUrl(m_scriptId, context ? context->resolvedUrl(m_source) : m_source); + } emit sourceChanged(); } @@ -614,7 +616,8 @@ QQuickWorkerScriptEngine *QQuickWorkerScript::engine() { if (m_engine) return m_engine; if (m_componentComplete) { - QQmlEngine *engine = qmlEngine(this); + const QQmlContext *context = qmlContext(this); + QQmlEngine *engine = context ? context->engine() : nullptr; if (!engine) { qWarning("QQuickWorkerScript: engine() called without qmlEngine() set"); return nullptr; @@ -628,7 +631,7 @@ QQuickWorkerScriptEngine *QQuickWorkerScript::engine() m_scriptId = m_engine->registerWorkerScript(this); if (m_source.isValid()) - m_engine->executeUrl(m_scriptId, m_source); + m_engine->executeUrl(m_scriptId, context->resolvedUrl(m_source)); emit readyChanged(); diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp index eb3385c8f8..9de48cbf5f 100644 --- a/src/quick/items/qquickanimatedimage.cpp +++ b/src/quick/items/qquickanimatedimage.cpp @@ -339,8 +339,10 @@ void QQuickAnimatedImage::load() const qreal targetDevicePixelRatio = (window() ? window()->effectiveDevicePixelRatio() : qApp->devicePixelRatio()); d->devicePixelRatio = 1.0; - QUrl loadUrl = d->url; - resolve2xLocalFile(d->url, targetDevicePixelRatio, &loadUrl, &d->devicePixelRatio); + const auto context = qmlContext(this); + QUrl loadUrl = context ? context->resolvedUrl(d->url) : d->url; + const QUrl resolvedUrl = loadUrl; + resolve2xLocalFile(resolvedUrl, targetDevicePixelRatio, &loadUrl, &d->devicePixelRatio); QString lf = QQmlFile::urlToLocalFileOrQrc(loadUrl); if (!lf.isEmpty()) { @@ -393,7 +395,9 @@ void QQuickAnimatedImage::movieRequestFinished() #endif if (!d->movie || !d->movie->isValid()) { - qmlWarning(this) << "Error Reading Animated Image File " << d->url.toString(); + const QQmlContext *context = qmlContext(this); + qmlWarning(this) << "Error Reading Animated Image File " + << (context ? context->resolvedUrl(d->url) : d->url).toString(); d->setMovie(nullptr); d->setImage(QImage()); if (d->progress != 0) { diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp index 3679df37d1..b8828d23ba 100644 --- a/src/quick/items/qquickborderimage.cpp +++ b/src/quick/items/qquickborderimage.cpp @@ -299,7 +299,9 @@ void QQuickBorderImage::load() loadEmptyUrl(); } else { if (d->url.path().endsWith(QLatin1String("sci"))) { - QString lf = QQmlFile::urlToLocalFileOrQrc(d->url); + const QQmlContext *context = qmlContext(this); + QString lf = QQmlFile::urlToLocalFileOrQrc(context ? context->resolvedUrl(d->url) + : d->url); if (!lf.isEmpty()) { QFile file(lf); file.open(QIODevice::ReadOnly); diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp index 0e5313db67..750b71b25e 100644 --- a/src/quick/items/qquickimagebase.cpp +++ b/src/quick/items/qquickimagebase.cpp @@ -298,8 +298,9 @@ void QQuickImageBase::loadPixmap(const QUrl &url, LoadPixmapOptions loadOptions) options |= QQuickPixmap::Cache; d->pix.clear(this); QUrl loadUrl = url; - if (const QQmlEngine *engine = qmlEngine(this)) - loadUrl = engine->interceptUrl(loadUrl, QQmlAbstractUrlInterceptor::UrlString); + const QQmlContext *context = qmlContext(this); + if (context) + loadUrl = context->resolvedUrl(url); if (loadOptions & HandleDPR) { const qreal targetDevicePixelRatio = (window() ? window()->effectiveDevicePixelRatio() : qApp->devicePixelRatio()); @@ -311,7 +312,8 @@ void QQuickImageBase::loadPixmap(const QUrl &url, LoadPixmapOptions loadOptions) if (!updatedDevicePixelRatio) { // (possible) local file: loadUrl and d->devicePixelRatio will be modified if // an "@2x" file is found. - resolve2xLocalFile(d->url, targetDevicePixelRatio, &loadUrl, &d->devicePixelRatio); + resolve2xLocalFile(context ? context->resolvedUrl(d->url) : d->url, + targetDevicePixelRatio, &loadUrl, &d->devicePixelRatio); } } diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index 40e0c3219a..0d47931063 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -439,9 +439,8 @@ void QQuickLoader::loadFromSource() } if (isComponentComplete()) { - QQmlComponent::CompilationMode mode = d->asynchronous ? QQmlComponent::Asynchronous : QQmlComponent::PreferSynchronous; if (!d->component) - d->component.setObject(new QQmlComponent(qmlEngine(this), d->source, mode, this), this); + d->createComponent(); d->load(); } } @@ -796,11 +795,8 @@ void QQuickLoader::componentComplete() Q_D(QQuickLoader); QQuickItem::componentComplete(); if (active()) { - if (d->loadingFromSource) { - QQmlComponent::CompilationMode mode = d->asynchronous ? QQmlComponent::Asynchronous : QQmlComponent::PreferSynchronous; - if (!d->component) - d->component.setObject(new QQmlComponent(qmlEngine(this), d->source, mode, this), this); - } + if (d->loadingFromSource) + d->createComponent(); d->load(); } } @@ -1027,6 +1023,17 @@ void QQuickLoaderPrivate::updateStatus() } } +void QQuickLoaderPrivate::createComponent() +{ + Q_Q(QQuickLoader); + const QQmlComponent::CompilationMode mode = asynchronous + ? QQmlComponent::Asynchronous + : QQmlComponent::PreferSynchronous; + QQmlContext *context = qmlContext(q); + component.setObject(new QQmlComponent( + context->engine(), context->resolvedUrl(source), mode, q), q); +} + #include <moc_qquickloader_p.cpp> QT_END_NAMESPACE diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h index 39d50280c5..b178803c7d 100644 --- a/src/quick/items/qquickloader_p_p.h +++ b/src/quick/items/qquickloader_p_p.h @@ -98,6 +98,7 @@ public: QV4::ReturnedValue extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error); QQuickLoader::Status computeStatus() const; void updateStatus(); + void createComponent(); qreal getImplicitWidth() const override; qreal getImplicitHeight() const override; diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp index 58f3de8b7b..28ec8f41e4 100644 --- a/src/quick/items/qquicksprite.cpp +++ b/src/quick/items/qquicksprite.cpp @@ -40,6 +40,7 @@ #include "qquicksprite_p.h" #include "qquickimagebase_p.h" #include <qqml.h> +#include <QQmlContext> #include <QDebug> #include <QRandomGenerator> @@ -261,14 +262,18 @@ void QQuickSprite::startImageLoading() { m_pix.clear(this); if (!m_source.isEmpty()) { - QQmlEngine *e = qmlEngine(this); + const QQmlContext *context = qmlContext(this); + QQmlEngine *e = context ? context->engine() : nullptr; if (!e) { //If not created in QML, you must set the QObject parent to the QML element so this can work - e = qmlEngine(parent()); + context = qmlContext(parent()); + e = context ? context->engine() : nullptr; if (!e) qWarning() << "QQuickSprite: Cannot find QQmlEngine - this class is only for use in QML and may not work"; } - QUrl loadUrl = m_source; - QQuickImageBase::resolve2xLocalFile(m_source, m_devicePixelRatio, &loadUrl, &m_devicePixelRatio); + const QUrl resolvedUrl = context ? context->resolvedUrl(m_source) : m_source; + QUrl loadUrl = resolvedUrl; + QQuickImageBase::resolve2xLocalFile(resolvedUrl, m_devicePixelRatio, &loadUrl, + &m_devicePixelRatio); m_pix.load(e, loadUrl); } diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index bbf6e4f8b8..79665a3cda 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1218,8 +1218,9 @@ void QQuickTextPrivate::setLineGeometry(QTextLine &line, qreal lineWidth, qreal image->position < line.textStart() + line.textLength()) { if (!image->pix) { - QUrl url = q->baseUrl().resolved(image->url); - image->pix = new QQuickPixmap(qmlEngine(q), url, QRect(), image->size); + const QQmlContext *context = qmlContext(q); + const QUrl url = context->resolvedUrl(q->baseUrl()).resolved(image->url); + image->pix = new QQuickPixmap(context->engine(), url, QRect(), image->size); if (image->pix->isLoading()) { image->pix->connectFinished(q, SLOT(imageDownloadFinished())); if (!extra.isAllocated() || !extra->nbActiveDownloads) @@ -1285,7 +1286,8 @@ void QQuickTextPrivate::ensureDoc() extra.value().doc = new QQuickTextDocumentWithImageResources(q); extra->doc->setPageSize(QSizeF(0, 0)); extra->doc->setDocumentMargin(0); - extra->doc->setBaseUrl(q->baseUrl()); + const QQmlContext *context = qmlContext(q); + extra->doc->setBaseUrl(context ? context->resolvedUrl(q->baseUrl()) : q->baseUrl()); qmlobject_connect(extra->doc, QQuickTextDocumentWithImageResources, SIGNAL(imagesLoaded()), q, QQuickText, SLOT(q_updateLayout())); } diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 5494b73784..f5a32b8d88 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -1465,7 +1465,9 @@ void QQuickTextEdit::componentComplete() Q_D(QQuickTextEdit); QQuickImplicitSizeItem::componentComplete(); - d->document->setBaseUrl(baseUrl()); + const QUrl url = baseUrl(); + const QQmlContext *context = qmlContext(this); + d->document->setBaseUrl(context ? context->resolvedUrl(url) : url); #if QT_CONFIG(texthtmlparser) if (d->richText) d->control->setHtml(d->text); diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp index e672fb8510..c27ed25d41 100644 --- a/src/quick/util/qquickfontloader.cpp +++ b/src/quick/util/qquickfontloader.cpp @@ -247,24 +247,27 @@ void QQuickFontLoader::setSource(const QUrl &url) d->url = url; emit sourceChanged(); - QString localFile = QQmlFile::urlToLocalFileOrQrc(d->url); + const QQmlContext *context = qmlContext(this); + const QUrl &resolvedUrl = context ? context->resolvedUrl(d->url) : d->url; + QString localFile = QQmlFile::urlToLocalFileOrQrc(resolvedUrl); if (!localFile.isEmpty()) { - if (!fontLoaderFonts()->map.contains(d->url)) { + if (!fontLoaderFonts()->map.contains(resolvedUrl)) { int id = QFontDatabase::addApplicationFont(localFile); updateFontInfo(id); if (id != -1) { QQuickFontObject *fo = new QQuickFontObject(id); - fontLoaderFonts()->map[d->url] = fo; + fontLoaderFonts()->map[resolvedUrl] = fo; } } else { - updateFontInfo(fontLoaderFonts()->map.value(d->url)->id); + updateFontInfo(fontLoaderFonts()->map.value(resolvedUrl)->id); } } else { - if (!fontLoaderFonts()->map.contains(d->url)) { + if (!fontLoaderFonts()->map.contains(resolvedUrl)) { + Q_ASSERT(context); #if QT_CONFIG(qml_network) QQuickFontObject *fo = new QQuickFontObject; - fontLoaderFonts()->map[d->url] = fo; - fo->download(d->url, qmlEngine(this)->networkAccessManager()); + fontLoaderFonts()->map[resolvedUrl] = fo; + fo->download(resolvedUrl, context->engine()->networkAccessManager()); d->status = Loading; emit statusChanged(); QObject::connect(fo, SIGNAL(fontDownloaded(int)), @@ -273,7 +276,7 @@ void QQuickFontLoader::setSource(const QUrl &url) // Silently fail if compiled with no_network #endif } else { - QQuickFontObject *fo = fontLoaderFonts()->map.value(d->url); + QQuickFontObject *fo = fontLoaderFonts()->map.value(resolvedUrl); if (fo->id == -1) { #if QT_CONFIG(qml_network) d->status = Loading; @@ -321,8 +324,11 @@ void QQuickFontLoader::updateFontInfo(int id) } if (status != d->status) { - if (status == Error) - qmlWarning(this) << "Cannot load font: \"" << d->url.toString() << '"'; + if (status == Error) { + const QQmlContext *context = qmlContext(this); + qmlWarning(this) << "Cannot load font: \"" + << (context ? context->resolvedUrl(d->url) : d->url).toString() << '"'; + } d->status = status; emit statusChanged(); } |