feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Change-Id: Ibbf9f16677a58bdcdd3ce63701ffa34db6f44916
This commit is contained in:
Eike Ziller
2020-05-11 11:36:22 +02:00
parent b9e79f7852 c370d345f1
commit 20ef5c6de3
270 changed files with 2794 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/marketplace/productlistmodel.cpp
View File

@@ -106,7 +106,7 @@ void ProductListModel::onFetchCollectionsFinished(QNetworkReply *reply)
const auto handle = obj.value("handle").toString();
const int productsCount = obj.value("products_count").toInt();
if (productsCount > 0 && handle != "all-products")
if (productsCount > 0 && handle != "all-products" && handle != "qt-education-1")
m_pendingCollections.append(handle);
}
if (!m_pendingCollections.isEmpty())