[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [kdepimlibs/frameworks] kalarmcal: Fix includes
From:       laurent Montel <montel () kde ! org>
Date:       2014-04-14 5:08:07
Message-ID: 1904673.Ljg2nEirM4 () linux-19td
[Download RAW message or body]

On lundi 14 avril 2014 00:10:02 David Jarvie wrote:
> On Thu, April 10, 2014 9:52 pm, Montel Laurent wrote:
> > Git commit 47887faf20874ee27c2936e49a3ad885419adc8d by Montel Laurent.
> > Committed on 10/04/2014 at 19:23.
> > Pushed by mlaurent into branch 'frameworks'.
> > 
> > Fix includes
> > 
> > A  +69   -0    kalarmcal/CMakeLists.txt
> > A  +8    -0    kalarmcal/KF5KAlarmCalConfig.cmake.in
> > M  +26   -31   kalarmcal/src/CMakeLists.txt
> > M  +1    -0    kalarmcal/src/alarmtext.cpp
> > M  +1    -1    kalarmcal/src/collectionattribute.h
> > M  +1    -1    kalarmcal/src/compatibilityattribute.h
> > M  +1    -1    kalarmcal/src/eventattribute.h
> > M  +1    -1    kalarmcal/src/kacalendar.h
> > M  +2    -2    kalarmcal/src/kaevent.h
> > M  +1    -0    kalarmcal/src/karecurrence.cpp
> > 
> > http://commits.kde.org/kdepimlibs/47887faf20874ee27c2936e49a3ad885419adc8d
> > 
> > 
> > 
> > 
> > diff --git a/kalarmcal/src/CMakeLists.txt b/kalarmcal/src/CMakeLists.txt
> > index 5dcfc71..e180b30 100644
> > --- a/kalarmcal/src/CMakeLists.txt
> > +++ b/kalarmcal/src/CMakeLists.txt
> > @@ -1,13 +1,9 @@
> > -project(kalarmcal)
> > +# The includes in akonadi/ use exceptions, we must enable them here for
> > clang to be happy.
> > +kde_enable_exceptions()
> > 
> >  find_package(Qt5 NO_MODULE REQUIRED COMPONENTS Sql)
> >  find_package(KF5 NO_MODULE REQUIRED COMPONENTS CoreAddons ItemViews)
> > 
> > -# The library version should be the same as that returned by
> > -# KAEvent::currentCalendarVersion()  (see kaevent.cpp)
> > -set(LIB_VERSION 2.7.0)
> > -set(LIB_SOVERSION 2)
> > -
> > 
> >  add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5955)
> >  add_definitions( -DQT_NO_CAST_FROM_ASCII )
> >  add_definitions( -DQT_NO_CAST_TO_ASCII )
> 
> Removing LIB_VERSION and LIB_SOVERSION breaks things, as the removed
> comment immediately above explains. If these definitions of library
> versions really need to be removed, then at the very least there needs to
> be a TODO added to KAEvent::currentCalendarVersion() to ensure that it
> will be amended to fix the breakage.

Hi,
Ok I will do it.

Regards

-- 
Laurent Montel | laurent.montel@kdab.com | KDE/Qt Senior Software Engineer
KDAB (France) S.A.S., a KDAB Group company
Tel. France +33 (0)4 90 84 08 53,  http://www.kdab.fr


[prev in list] [next in list] [prev in thread] [next in thread]