diff options
| author | Samuel Ghinet <samuel.ghinet@qt.io> | 2023-03-28 20:46:31 +0300 |
|---|---|---|
| committer | Samuel Ghinet <samuel.ghinet@qt.io> | 2023-03-29 15:26:15 +0000 |
| commit | a59cf942e0edf8099bf535f40fcf3caddecdd7f8 (patch) | |
| tree | d17b52fbed0a73edd933a03e104b1710c81aa702 /src/plugins/qmldesigner | |
| parent | 0184e38708c4e20c02897447bf6690bc5051c149 (diff) | |
| download | qt-creator-a59cf942e0edf8099bf535f40fcf3caddecdd7f8.tar.gz | |
QmlDesigner: Fix materials & textures not shown when internet is down
If internet is down, or, for some reason, the URLs are inaccessible,
then we should still show the existing materials and textures.
Task-number: QDS-9582
Change-Id: Ic9516c7bc00a37d1c3cd31643749f51a217bf317
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp index c2883ce5d3..127ecb4225 100644 --- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp +++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp @@ -114,7 +114,7 @@ bool ContentLibraryMaterialsModel::fetchBundleIcons(const QDir &bundleDir) QString iconsPath = bundleDir.filePath("icons"); QDir iconsDir(iconsPath); - if (iconsDir.exists() && iconsDir.entryList(QDir::NoDotAndDotDot).length() > 0) + if (iconsDir.exists() && iconsDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot).length() > 0) return true; QString zipFileUrl = m_baseUrl + "/icons.zip"; diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp index 639d0154de..2f382416a2 100644 --- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp +++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp @@ -110,7 +110,7 @@ void ContentLibraryTexturesModel::loadTextureBundle(const QString &remoteUrl, co return; } - const QFileInfoList dirs = bundleDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); + const QFileInfoList dirs = bundleDir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot); for (const QFileInfo &dir : dirs) { auto category = new ContentLibraryTexturesCategory(this, dir.fileName()); const QFileInfoList texFiles = QDir(dir.filePath()).entryInfoList(QDir::Files); diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp index 8b3868d38e..04e70399bd 100644 --- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp @@ -229,7 +229,7 @@ bool ContentLibraryWidget::fetchTextureBundleIcons(const QDir &bundleDir) QString iconsPath = bundleDir.filePath("TextureBundleIcons"); QDir iconsDir(iconsPath); - if (iconsDir.exists() && iconsDir.entryList(QDir::NoDotAndDotDot).length() > 0) + if (iconsDir.exists() && iconsDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot).length() > 0) return true; QString zipFileUrl = m_baseUrl + "/icons.zip"; |