diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2024-03-18 15:11:37 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2024-03-25 19:03:04 +0100 |
| commit | 2f488d22c3e414e8b0e4cfbb5aeaffd8fd68ef03 (patch) | |
| tree | 8cc55bc61332870c00eb06b558913a82b5e1fbf6 /src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.cpp | |
| parent | 07f9a8b24e8318046aaa5d71bfe78f53423d2339 (diff) | |
QQmlPreviewFileEngine: adapt to changes in QAFileEngine/Iterator [4]
See commit 3c50ad828861bee82e53469deab28b4e286cbeda in qtbase.
Pick-to: 6.7
Change-Id: Ie1bc23f0cf93c90dde1551024d2a23b2c3f2a1dc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.cpp')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.cpp index 02f25eca22..7cc9b3f3c1 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.cpp @@ -380,7 +380,7 @@ void QQmlPreviewFileEngine::load() const m_entries = m_loader->entries(); break; case QQmlPreviewFileLoader::Fallback: - m_fallback.reset(QAbstractFileEngine::create(m_name)); + m_fallback = QAbstractFileEngine::create(m_name); break; case QQmlPreviewFileLoader::Unknown: Q_UNREACHABLE(); @@ -393,7 +393,8 @@ QQmlPreviewFileEngineHandler::QQmlPreviewFileEngineHandler(QQmlPreviewFileLoader { } -QAbstractFileEngine *QQmlPreviewFileEngineHandler::create(const QString &fileName) const +std::unique_ptr<QAbstractFileEngine> QQmlPreviewFileEngineHandler::create( + const QString &fileName) const { // Don't load compiled QML/JS over the network if (fileName.endsWith(".qmlc") || fileName.endsWith(".jsc") || isRootPath(fileName)) { @@ -409,8 +410,10 @@ QAbstractFileEngine *QQmlPreviewFileEngineHandler::create(const QString &fileNam const QString absolute = relative.startsWith(':') ? relative : absolutePath(relative); - return m_loader->isBlacklisted(absolute) - ? nullptr : new QQmlPreviewFileEngine(relative, absolute, m_loader.data()); + if (m_loader->isBlacklisted(absolute)) + return {}; + + return std::make_unique<QQmlPreviewFileEngine>(relative, absolute, m_loader.data()); } QT_END_NAMESPACE |