aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickpixmapcache
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2020-04-06 09:52:45 +0200
committerMårten Nordheim <marten.nordheim@qt.io>2020-04-06 11:24:02 +0200
commit680d56c1c09e15f477a4d1e4ea4de613596ad8fd (patch)
tree6baf2027013e6824165af315695dad2e4cafdc26 /tests/auto/quick/qquickpixmapcache
parenta793e88d3b29e770914772ed50af916b8132bf3b (diff)
Remove use of bearer management
It's now been deleted in QtBase. No extensive usage here. Task-number: QTBUG-76502 Change-Id: Ib79a972fc2a66122eaeb75d0d5e00a687ea9a9d7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickpixmapcache')
-rw-r--r--tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
index 88cf6ece96..8ebbd0d59b 100644
--- a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
+++ b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
@@ -34,7 +34,6 @@
#include <QNetworkReply>
#include "../../shared/util.h"
#include "testhttpserver.h"
-#include <QtNetwork/QNetworkConfigurationManager>
#if QT_CONFIG(concurrent)
#include <qtconcurrentrun.h>
@@ -107,15 +106,6 @@ void tst_qquickpixmapcache::initTestCase()
QVERIFY2(server.listen(), qPrintable(server.errorString()));
-#if QT_CONFIG(bearermanagement)
- // This avoids a race condition/deadlock bug in network config
- // manager when it is accessed by the HTTP server thread before
- // anything else. Bug report can be found at:
- // QTBUG-26355
- QNetworkConfigurationManager cm;
- cm.updateConfigurations();
-#endif
-
server.serveDirectory(testFile("http"));
}