[vlmc-devel] [PATCH] excluded check for QT4

Hugo Beauzée-Luyssen hugo at beauzee.fr
Mon Mar 7 13:28:44 CET 2016


On 03/07/2016 12:07 PM, sanket.markan wrote:
> fixed patch :)
>
> diff --git a/src/EffectsEngine/EffectsEngine.cpp
> b/src/EffectsEngine/EffectsEngine.cpp
> index 3b56104..79b4427 100644
> --- a/src/EffectsEngine/EffectsEngine.cpp
> +++ b/src/EffectsEngine/EffectsEngine.cpp
> @@ -27,14 +27,11 @@
>   #include <QXmlStreamWriter>
>
>   #include <QtGlobal>
> -#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
> -# include <QStandardPaths>
> -#else
> -# include <QDesktopServices>
> -#endif
> +#include <QStandardPaths>
> +#include <QDesktopServices>
>
>   #ifdef Q_OS_WIN
> -# include <windows.h>
> +#include <windows.h>

This doesn't belong in this patch

>   #endif
>
>
> @@ -46,14 +43,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

It still doesn't apply for me. It seems your context lines are prefixed 
by 2 spaces instead of 1, I must say I don't see what could cause this :|

Regards,


More information about the Vlmc-devel mailing list