diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-04-09 09:58:17 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-04-09 11:39:56 +0200 |
| commit | 9d7e786b03b5af13048471a23d9f4ccb34b32d8e (patch) | |
| tree | acd4a0fdbad7d3817eccbe69d8e2ad920e7bc34b /src/plugins/texteditor/generichighlighter/manager.h | |
| parent | 2ead48fb2674c26aede63382277e9647f93e6586 (diff) | |
| download | qt-creator-9d7e786b03b5af13048471a23d9f4ccb34b32d8e.tar.gz | |
Provide instance()-method for Utils::NetworkAccessManager.
Preemptively fix exit warning "QEventLoop cannot be used
without QApplication" (Qt 5/dev) emitted by destruction of
the of the generic highlighter manager singleton which had a
member of type Utils::NetworkAccessManager.
Use a single instance of Utils::NetworkAccessManager for the
main thread and clean up properly using a qAddPostRoutine().
Change-Id: Ida57b9028a79eb4927818ce49088ea567f3bdfd6
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/texteditor/generichighlighter/manager.h')
| -rw-r--r-- | src/plugins/texteditor/generichighlighter/manager.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/texteditor/generichighlighter/manager.h b/src/plugins/texteditor/generichighlighter/manager.h index c74d4bdfc7..548ef118ee 100644 --- a/src/plugins/texteditor/generichighlighter/manager.h +++ b/src/plugins/texteditor/generichighlighter/manager.h @@ -43,8 +43,6 @@ #include <QSharedPointer> #include <QFutureWatcher> -#include <utils/networkaccessmanager.h> - QT_BEGIN_NAMESPACE class QFileInfo; class QStringList; @@ -101,7 +99,6 @@ private: bool m_isDownloadingDefinitionsSpec; QList<DefinitionDownloader *> m_downloaders; QFutureWatcher<void> m_downloadWatcher; - Utils::NetworkAccessManager m_networkManager; QList<HighlightDefinitionMetaData> parseAvailableDefinitionsList(QIODevice *device) const; QSet<QString> m_isBuildingDefinition; |