[calligra] /: Merge branch 'kexi-modern_menu-staniek'

[Boudewijn Rempt]

On Monday 05 September 2011 Sep, Cyrille Berger Skott wrote:
> On Monday 05 September 2011, you wrote:
> > On Monday 05 September 2011 Sep, Cyrille Berger Skott wrote:
> > > Hi,
> > > 
> > > This commit introduces the following error when configuring calligra and
> > > qimageblitz is not installed:
> > > 
> > > http://my.cdash.org/viewConfigure.php?buildid=228394
> > > 
> > > Can you make sure that qimageblitz is an optional dependency and disable
> > > building kexi inside the top CMakeLists.txt ?
> > 
> > Done -- and then I also commented out the use of qimageblitz in kexi, since
> > it was only included and linked, not even used anymore...
> Thanks... But now, I get this:
> 
> http://my.cdash.org/viewBuildError.php?buildid=228624
> 
> setPlaceholderText was introduced with Qt 4.7.

I'll comment that out for now, jaroslaw hasn't got access to the code today.

-- 
Boudewijn Rempt
http://www.valdyas.org, http://www.krita.org, http://www.boudewijnrempt.nl