From cef92bf0579c5819685fbe3270638c671058671d Mon Sep 17 00:00:00 2001 From: Daniel Kristjansson Date: Mon, 25 Feb 2013 22:01:41 -0500 Subject: [PATCH] Conditionally compile netutils.h code only in Qt4 build. netutils.h uses HTTP APIs that are gone in Qt5. --- mythtv/programs/mythbackend/internetContent.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mythtv/programs/mythbackend/internetContent.cpp b/mythtv/programs/mythbackend/internetContent.cpp index 6b1336df9b6..6ec9a0bab76 100644 --- a/mythtv/programs/mythbackend/internetContent.cpp +++ b/mythtv/programs/mythbackend/internetContent.cpp @@ -23,9 +23,12 @@ #include "mythdirs.h" #include "rssparse.h" -#include "netutils.h" #include "netgrabbermanager.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) +#include "netutils.h" +#endif + ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// @@ -139,6 +142,7 @@ void InternetContent::GetInternetSearch( HTTPRequest *pRequest ) "Command: %1 -p %2 -S '%3'") .arg(command).arg(pagenum).arg(query)); +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) Search *search = new Search(); QEventLoop loop; @@ -161,6 +165,9 @@ void InternetContent::GetInternetSearch( HTTPRequest *pRequest ) return; pRequest->FormatRawResponse( ret.toString() ); +#else +#warning InternetContent::GetInternetSearch() not yet ported to Qt5 +#endif } /////////////////////////////////////////////////////////////////////////////