summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2016-01-17 20:47:08 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2016-01-17 20:47:08 +0100
commit1015088d90275336e7b999624d2524800b8aa3e8 (patch)
treee63821b911055898910e1ab9e6321fb4a68162cc /rbutil
parent5c027e3b5c667ad17728cb04265835887fe6eb62 (diff)
downloadrockbox-1015088d90275336e7b999624d2524800b8aa3e8.tar.gz
rockbox-1015088d90275336e7b999624d2524800b8aa3e8.tar.bz2
rockbox-1015088d90275336e7b999624d2524800b8aa3e8.zip
Fix building with Qt 4.7.
QUrl::isLocalFile() is available starting with Qt 4.8. We can safely check for a file:// url instead. Qt 4.8 dropped support for OS X 10.4 / 10.5. Since we're still supporting those we need to keep using Qt 4.7 on OS X. We might want to consider requiring at least 10.6 on OS X with the next major release of Rockbox Utility. Change-Id: I18998fe3c7a38773479bc7a1c32ca6e4966359e9
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/base/httpget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/httpget.cpp b/rbutil/rbutilqt/base/httpget.cpp
index 476da87bad..1c879e728a 100644
--- a/rbutil/rbutilqt/base/httpget.cpp
+++ b/rbutil/rbutilqt/base/httpget.cpp
@@ -170,7 +170,7 @@ void HttpGet::requestFinished(QNetworkReply* reply)
return;
}
else if(m_lastStatusCode == 200 ||
- (reply->url().isLocalFile() && reply->error() == 0)) {
+ (reply->url().scheme() == "file" && reply->error() == 0)) {
// callers might not be aware if the request is file:// so fake 200.
m_lastStatusCode = 200;
m_data = reply->readAll();