aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/texteditor/generichighlighter
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2016-04-15 10:07:49 +0200
committerEike Ziller <eike.ziller@theqtcompany.com>2016-04-15 10:07:55 +0200
commit8a77eacf8d8c8f4877105e4758c7e587d01b4d83 (patch)
treef67167a3c1c5f63cde88d38a3606d90e567f6274 /src/plugins/texteditor/generichighlighter
parent0338f6909c5ca5f265018304b15227530ba787e0 (diff)
parent7080645d20adc20a025b99ccd116575901165af5 (diff)
Merge remote-tracking branch 'origin/4.0'
Diffstat (limited to 'src/plugins/texteditor/generichighlighter')
-rw-r--r--src/plugins/texteditor/generichighlighter/definitiondownloader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp b/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp
index 0feb75e489..680d811148 100644
--- a/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp
+++ b/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp
@@ -39,10 +39,8 @@
namespace TextEditor {
namespace Internal {
-static QNetworkReply *getData(const QUrl &url)
+static QNetworkReply *getData(QNetworkAccessManager *manager, const QUrl &url)
{
- Utils::NetworkAccessManager *manager = Utils::NetworkAccessManager::instance();
-
QNetworkRequest request(url);
QNetworkReply *reply = manager->get(request);
@@ -59,10 +57,12 @@ DefinitionDownloader::DefinitionDownloader(const QUrl &url, const QString &local
void DefinitionDownloader::run()
{
+ Utils::NetworkAccessManager manager;
+
int currentAttempt = 0;
const int maxAttempts = 5;
while (currentAttempt < maxAttempts) {
- QScopedPointer<QNetworkReply> reply(getData(m_url));
+ QScopedPointer<QNetworkReply> reply(getData(&manager, m_url));
if (reply->error() != QNetworkReply::NoError) {
m_status = NetworkError;
return;