feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '2.3'

Browse Source 
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
This commit is contained in:
Oswald Buddenhagen
2011-07-25 13:57:13 +02:00
parent 76a5b1953c 899cc03003
commit ae8ac2eb2f
196 changed files with 3087 additions and 1177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitorious/gitorious.cpp
View File

@@ -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));