diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-25 13:57:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-25 13:57:13 +0200 |
| commit | ae8ac2eb2f118cfb96efec7a40aa8d55be2704ee (patch) | |
| tree | fd36ac3e15c7c243d890d5e91544af5307f8c9fc /src/plugins/texteditor/generichighlighter/manager.h | |
| parent | 76a5b1953ca230d813340a9d536d636aacd0929b (diff) | |
| parent | 899cc0300336a51f0d553c10d0769b145f99af00 (diff) | |
| download | qt-creator-ae8ac2eb2f118cfb96efec7a40aa8d55be2704ee.tar.gz | |
Merge branch '2.3'
Conflicts:
qtcreator.pri
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
src/plugins/remotelinux/maemodeploystepfactory.cpp
src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp
Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
Diffstat (limited to 'src/plugins/texteditor/generichighlighter/manager.h')
| -rw-r--r-- | src/plugins/texteditor/generichighlighter/manager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/texteditor/generichighlighter/manager.h b/src/plugins/texteditor/generichighlighter/manager.h index 759540ea35..d6f5db6fe5 100644 --- a/src/plugins/texteditor/generichighlighter/manager.h +++ b/src/plugins/texteditor/generichighlighter/manager.h @@ -45,7 +45,7 @@ #include <QtCore/QSharedPointer> #include <QtCore/QFutureWatcher> -#include <coreplugin/networkaccessmanager.h> +#include <utils/networkaccessmanager.h> QT_BEGIN_NAMESPACE class QFileInfo; @@ -114,7 +114,7 @@ private: QSet<QString> m_isBuilding; QList<DefinitionDownloader *> m_downloaders; - Core::NetworkAccessManager m_networkManager; + Utils::NetworkAccessManager m_networkManager; QFutureWatcher<void> m_downloadWatcher; QFutureWatcher<Core::MimeType> m_mimeTypeWatcher; |