[vlmc-devel] [PATCH] excluded check for QT4
Hugo Beauzée-Luyssen
hugo at beauzee.fr
Mon Mar 7 10:24:22 CET 2016
On 03/06/2016 10:01 PM, sanket.markan wrote:
> Removed redundant check for qt version
>
> diff --git a/src/EffectsEngine/EffectsEngine.cpp
> b/src/EffectsEngine/EffectsEngine.cpp
> index 3b56104..da7e139 100644
> --- a/src/EffectsEngine/EffectsEngine.cpp
> +++ b/src/EffectsEngine/EffectsEngine.cpp
> @@ -27,11 +27,7 @@
> #include <QXmlStreamWriter>
>
> #include <QtGlobal>
> -#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
> # include <QStandardPaths>
> -#else
> -# include <QDesktopServices>
> -#endif
>
> #ifdef Q_OS_WIN
> # include <windows.h>
> @@ -46,14 +42,8 @@
>
> EffectsEngine::EffectsEngine()
> {
> -#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
> m_cache = new QSettings( QStandardPaths::writableLocation(
> QStandardPaths::CacheLocation ) + "/effects",
> -#else
> - m_cache = new QSettings( QDesktopServices::storageLocation(
> - QDesktopServices::CacheLocation ) + "/effects",
> -#endif
> -
> QSettings::IniFormat, this );
> m_cache->setFallbacksEnabled( false );
> //Create the names entry. A bit ugly but faster (I guess...)
> afterward.
>
> _______________________________________________
> Vlmc-devel mailing list
> Vlmc-devel at videolan.org
> https://mailman.videolan.org/listinfo/vlmc-devel
Hi,
The patch looks good but doesn't apply. It seems to be whitespace related
Regards,
More information about the Vlmc-devel
mailing list