From c8e9844aa9de9bd2724c83aa8cd2cda07a8d935c Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Sat, 7 Dec 2013 22:23:09 +0000 Subject: [PATCH] Fix Qt5 build - setEncodedUrl is deprecated in Qt5, and doesn't seem to be required. BUG: 344 --- http/httpserver.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/http/httpserver.cpp b/http/httpserver.cpp index 415ea911a..569153ecb 100644 --- a/http/httpserver.cpp +++ b/http/httpserver.cpp @@ -216,9 +216,13 @@ QByteArray HttpServer::encodeUrl(const QString &file) const Song HttpServer::decodeUrl(const QString &url) const { + #if QT_VERSION >= 0x050000 + return decodeUrl(QUrl(url)); + #else QUrl u; u.setEncodedUrl(url.toUtf8()); return decodeUrl(u); + #endif } Song HttpServer::decodeUrl(const QUrl &url) const