Changeset 769 for trunk/demos/browser/webview.cpp
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
-
trunk/demos/browser/webview.cpp
r651 r769 144 144 void WebPage::handleUnsupportedContent(QNetworkReply *reply) 145 145 { 146 if (reply->error() == QNetworkReply::NoError) { 147 BrowserApplication::downloadManager()->handleUnsupportedContent(reply); 146 QString errorString = reply->errorString(); 147 148 if (m_loadingUrl != reply->url()) { 149 // sub resource of this page 150 qWarning() << "Resource" << reply->url().toEncoded() << "has unknown Content-Type, will be ignored."; 151 reply->deleteLater(); 148 152 return; 153 } 154 155 if (reply->error() == QNetworkReply::NoError && !reply->header(QNetworkRequest::ContentTypeHeader).isValid()) { 156 errorString = "Unknown Content-Type"; 149 157 } 150 158 … … 157 165 QString html = QString(QLatin1String(file.readAll())) 158 166 .arg(title) 159 .arg( reply->errorString())167 .arg(errorString) 160 168 .arg(reply->url().toString()); 161 169
Note:
See TracChangeset
for help on using the changeset viewer.