diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-18 13:51:48 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-26 08:22:51 +0000 |
| commit | ddd8bba3e28ce6bc4b26b906fed977b4de2ab1f0 (patch) | |
| tree | 17b67493109621f248a7d69024959bad34a2db22 /tests/auto/quick/qquickpixmapcache | |
| parent | 9dd373913cab364c03a4a772517082cad6e511b6 (diff) | |
Fix disabling of text input and pixmap cache tests on QT_NO_LIBRARY
This way it works with the supported -no-feature-library flag to
configure, rather than the unsupportd -D QT_NO_LIBRARY. Also, the
the parts of the tests that can be executed stay active now.
Change-Id: I082b1c84f148a10eaaf4443c931c395bdd1dc4c3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/qquickpixmapcache')
| -rw-r--r-- | tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp index b9f93a4dcf..584cb78d3d 100644 --- a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp +++ b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp @@ -110,12 +110,14 @@ void tst_qquickpixmapcache::initTestCase() QVERIFY2(server.listen(), qPrintable(server.errorString())); +#ifndef QT_NO_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")); } |