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/git/gitorious | |
| 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/git/gitorious')
| -rw-r--r-- | src/plugins/git/gitorious/gitorious.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gitorious/gitorious.cpp b/src/plugins/git/gitorious/gitorious.cpp index 1a3cdee757..b5a8257454 100644 --- a/src/plugins/git/gitorious/gitorious.cpp +++ b/src/plugins/git/gitorious/gitorious.cpp @@ -39,7 +39,7 @@ #include <QtNetwork/QNetworkReply> -#include <coreplugin/networkaccessmanager.h> +#include <utils/networkaccessmanager.h> enum { debug = 0 }; @@ -529,7 +529,7 @@ void Gitorious::slotReplyFinished() QNetworkReply *Gitorious::createRequest(const QUrl &url, int protocol, int hostIndex, int page) { if (!m_networkManager) - m_networkManager = new Core::NetworkAccessManager(this); + m_networkManager = new Utils::NetworkAccessManager(this); QNetworkReply *reply = m_networkManager->get(QNetworkRequest(url)); connect(reply, SIGNAL(finished()), this, SLOT(slotReplyFinished())); reply->setProperty(protocolPropertyC, QVariant(protocol)); |