Index: configure =================================================================== --- configure (revision 25854) +++ configure (working copy) @@ -3220,15 +3220,15 @@ check_deps $ARCH_EXT_LIST is_qmake4(){ - $1 --version 2>&1 | egrep -q -e "Qt version 4\.[5-9]\.[0-9]" + $1 --version 2>&1 | egrep -q -e "Qt version 4\.[4-9]\.[0-9]" } if ! is_qmake4 $qmake; then - is_qmake4 qmake-qt4 && qmake=qmake-qt4 || die "qmake for Qt4.5 or newer not found.\nPlease specify the correct qmake with --qmake=" + is_qmake4 qmake-qt4 && qmake=qmake-qt4 || die "qmake for Qt4.4 or newer not found.\nPlease specify the correct qmake with --qmake=" fi -if ! expr $($qmake -query QT_VERSION) : "4\.[5-9]\.[0-9]" >/dev/null; then - die "Qt4.5 or newer is required to build MythTV." +if ! expr $($qmake -query QT_VERSION) : "4\.[4-9]\.[0-9]" >/dev/null; then + die "Qt4.4 or newer is required to build MythTV." fi enable_pic() { @@ -3928,7 +3928,7 @@ EOF fi -enabled qtwebkit || die "Error! QtWebkit headers not found" +#enabled qtwebkit || die "Error! QtWebkit headers not found" # Check if Qt was built with DBus support: check_ld_cxx ${qt_inc} ${qt_inc}/QtDBus ${qt_libs} -lQtDBus <= 0x040500 ) | PA_STREAM_ADJUST_LATENCY +#endif | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_NO_REMIX_CHANNELS; Index: libs/libmythdb/mythdownloadmanager.h =================================================================== --- libs/libmythdb/mythdownloadmanager.h (revision 25854) +++ libs/libmythdb/mythdownloadmanager.h (working copy) @@ -6,7 +6,11 @@ #include #include #include + +#if ( QT_VERSION >= 0x040500 ) #include +#endif + #include #include @@ -84,7 +88,9 @@ const bool append = false); QNetworkAccessManager *m_manager; +#if ( QT_VERSION >= 0x040500 ) QNetworkDiskCache *m_diskCache; +#endif QWaitCondition m_queueWaitCond; QMutex m_queueWaitLock; Index: libs/libmythdb/mythversion.h =================================================================== --- libs/libmythdb/mythversion.h (revision 25854) +++ libs/libmythdb/mythversion.h (working copy) @@ -4,8 +4,8 @@ #include "qglobal.h" #include "mythexp.h" -#if ( QT_VERSION < 0x040500 ) -#error You need Qt version >= 4.5.0 to compile MythTV. +#if ( QT_VERSION < 0x040400 ) +#error You need Qt version >= 4.4.0 to compile MythTV. #endif /// Update this whenever the plug-in API changes. Index: libs/libmythdb/mythdownloadmanager.cpp =================================================================== --- libs/libmythdb/mythdownloadmanager.cpp (revision 25854) +++ libs/libmythdb/mythdownloadmanager.cpp (working copy) @@ -139,7 +139,9 @@ */ MythDownloadManager::MythDownloadManager() : m_manager(NULL), +#if ( QT_VERSION >= 0x040500 ) m_diskCache(NULL), +#endif m_infoLock(new QMutex(QMutex::Recursive)), m_queueThread(NULL), m_runThread(false), @@ -176,13 +178,14 @@ usleep(50000); m_manager = new QNetworkAccessManager(this); +#if ( QT_VERSION >= 0x040500 ) m_diskCache = new QNetworkDiskCache(this); m_diskCache->setCacheDirectory(GetConfDir() + "/Cache-" + gCoreContext->GetAppName() + "-" + gCoreContext->GetHostName()); m_manager->setCache(m_diskCache); +#endif - QObject::connect(m_manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(downloadFinished(QNetworkReply*))); @@ -546,6 +549,7 @@ else request.setUrl(qurl); +#if ( QT_VERSION >= 0x040500 ) if (!dlInfo->m_reload) { // Prefer the in-cache item if one exists and it is less than 60 @@ -575,6 +579,7 @@ } } } +#endif if (dlInfo->m_preferCache) request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, @@ -990,6 +995,7 @@ VERBOSE(VB_FILE+VB_EXTRA, LOC + QString("GetLastModified('%1')").arg(url)); QDateTime result; +#if ( QT_VERSION >= 0x040500 ) QDateTime now = QDateTime::currentDateTime(); QNetworkCacheMetaData urlData = m_manager->cache()->metaData(QUrl(url)); @@ -1023,6 +1029,9 @@ } } } +#else + result = QDateTime::currentDateTime().addSecs(-60); +#endif if (!result.isValid()) {