Merge branch 'master' of https://github.com/worklist/hifi into 20224

Thijs Wenker committed 11 years ago

Commit 7acb4e42 parents 3da5677 2274a1161 files · +1178 −3425Browse files

Showing the changes to interface/src/Application.cpp (1 of 61 files). Show all

Unified · Split

interface/src/Application.cpp+2−2

@@ -3773,9 +3773,9 @@ void Application::parseVersionXml() { · 3772 unmodified lines
3773	QString latestVersion;	3773	QString latestVersion;
3774	QUrl downloadUrl;	3774	QUrl downloadUrl;
3775	QString releaseNotes("Unavailable");	3775	QString releaseNotes("Unavailable");
3776	QObject* sender = QObject::sender();	3776	QNetworkReply* sender = qobject_cast<QNetworkReply*>(QObject::sender());
3777		3777
3778	QXmlStreamReader xml(qobject_cast<QNetworkReply*>(sender));	3778	QXmlStreamReader xml(sender);
3779		3779
3780	while (!xml.atEnd() && !xml.hasError()) {	3780	while (!xml.atEnd() && !xml.hasError()) {
3781	if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == operatingSystem) {	3781	if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == operatingSystem) {