summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2023-05-10 21:00:18 +0000
committerTim Jenssen <tim.jenssen@qt.io>2023-05-10 21:00:52 +0000
commit36936196bf0bd000256cd658b6082b63425b8fba (patch)
treeaf5107cb48344cd1958119df667c58dc31c881a9
parent6a4313b7a8d06a3a6951be9203dbc26be9f0405b (diff)
downloadqt-creator-36936196bf0bd000256cd658b6082b63425b8fba.tar.gz
Revert "QmlDesigner: Add setting to force download mirror"
This reverts commit 6a4313b7a8d06a3a6951be9203dbc26be9f0405b. Reason for revert: does not compile on linux and it is maybe not a good idea that utils static lib gets a core plugin dependency Change-Id: I2bf153f94aa922a82776b490238ba0ba774d26aa Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--src/plugins/qmldesigner/utils/filedownloader.cpp16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/plugins/qmldesigner/utils/filedownloader.cpp b/src/plugins/qmldesigner/utils/filedownloader.cpp
index 5f0aabe309..7825be5081 100644
--- a/src/plugins/qmldesigner/utils/filedownloader.cpp
+++ b/src/plugins/qmldesigner/utils/filedownloader.cpp
@@ -2,8 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "filedownloader.h"
-#include <coreplugin/icore.h>
-
+#include <private/qqmldata_p.h>
#include <utils/networkaccessmanager.h>
#include <utils/filepath.h>
@@ -155,15 +154,6 @@ void FileDownloader::setUrl(const QUrl &url)
{
if (m_url != url) {
m_url = url;
-
- const QString mirror = Core::ICore::settings()->value("QML/Designer/ForceDownloadMirror").toString();
- if (!mirror.isEmpty()) {
- qWarning() << Q_FUNC_INFO << "Alternative mirror is used:" << mirror;
- QString replaced = url.toString();
- replaced.replace("https://download.qt.io/", mirror);
- m_url = QUrl::fromUserInput(replaced);
- }
-
emit urlChanged();
}
@@ -272,6 +262,10 @@ void FileDownloader::doProbeUrl()
this,
[this](QNetworkReply::NetworkError code) {
+ if (QQmlData::wasDeleted(this)) {
+ qDebug() << Q_FUNC_INFO << "FileDownloader was deleted.";
+ return;
+ }
qDebug() << Q_FUNC_INFO << "Network error:" << code
<< qobject_cast<QNetworkReply *>(sender())->errorString();