From a525bcd38785615180fefe7dd188c3925130b6b2 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Wed, 13 Aug 2014 11:04:58 +0200 Subject: [PATCH] hide constructor from string, that uses KComponentData, if Qt version is too recent --- kstyle/breezehelper.cpp | 2 ++ kstyle/breezehelper.h | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/kstyle/breezehelper.cpp b/kstyle/breezehelper.cpp index 31b2e1ce..abc83449 100644 --- a/kstyle/breezehelper.cpp +++ b/kstyle/breezehelper.cpp @@ -43,10 +43,12 @@ namespace Breeze { init(); } //____________________________________________________________________ + #if QT_VERSION < 0x050000 Helper::Helper( const QByteArray& name ): _componentData( name, 0, KComponentData::SkipMainComponentRegistration ), _config( _componentData.config() ) { init(); } + #endif //____________________________________________________________________ KSharedConfig::Ptr Helper::config() const diff --git a/kstyle/breezehelper.h b/kstyle/breezehelper.h index fa2328f4..e9c7c109 100644 --- a/kstyle/breezehelper.h +++ b/kstyle/breezehelper.h @@ -23,9 +23,12 @@ #include "breezeanimationdata.h" #include -#include #include +#if QT_VERSION < 0x050000 +#include +#endif + #include #include @@ -46,8 +49,10 @@ namespace Breeze //! constructor explicit Helper( KSharedConfig::Ptr ); + #if QT_VERSION < 0x050000 //! constructor explicit Helper( const QByteArray& ); + #endif //! destructor virtual ~Helper() @@ -249,8 +254,12 @@ namespace Breeze private: - //! configuration + #if QT_VERSION < 0x050000 + //! component data KComponentData _componentData; + #endif + + //! configuration KSharedConfig::Ptr _config; //!@name brushes