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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	src/libs/symbianutils/symbianutils.qbs
	src/libs/utils/utils.qbs
	src/libs/zeroconf/zeroconf.qbs

Change-Id: I4c888d8e58ec68dc4638b041b0c6ee743b809ab4
This commit is contained in:
Eike Ziller
2012-03-29 17:58:34 +02:00
parent 2a74097b54 c9bd695a90
commit 63244127a8
19 changed files with 98 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/help/helpviewer_qwv.cpp
View File

@@ -91,6 +91,7 @@ HelpNetworkReply::HelpNetworkReply(const QNetworkRequest &request,
setHeader(QNetworkRequest::ContentLengthHeader, QByteArray::number(dataLength));
QTimer::singleShot(0, this, SIGNAL(metaDataChanged()));
QTimer::singleShot(0, this, SIGNAL(readyRead()));
QTimer::singleShot(0, this, SIGNAL(finished()));
}
qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen)
@@ -100,8 +101,6 @@ qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen)
qMemCopy(buffer, data.constData(), len);
data.remove(0, len);
}
if (!data.length())
QTimer::singleShot(0, this, SIGNAL(finished()));
return len;
}