Review Request 125754: Fix build with QT5.6

[Martin Gräßlin]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125754/#review87253
-----------------------------------------------------------

Ship it!


Ship It!

- Martin Gräßlin


On Oct. 22, 2015, 11:54 a.m., David Kahles wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/125754/
> -----------------------------------------------------------
> 
> (Updated Oct. 22, 2015, 11:54 a.m.)
> 
> 
> Review request for Plasma.
> 
> 
> Repository: plasma-desktop
> 
> 
> Description
> -------
> 
> Since QT5.6, qpixmap.h pulls in qtextstream.h. Xlib.h has a
> but qtextstream.h uses Status as an enum name. fixx11h.h resolves this
> name clash.
> 
> 
> Diffs
> -----
> 
>   kcms/cursortheme/CMakeLists.txt 7e610069ab22b8635e05a59450431dbea4c083ee 
>   kcms/cursortheme/xcursor/xcursortheme.cpp 4fc70a605d5fc3165de78916db92c13bb67c0429 
> 
> Diff: https://git.reviewboard.kde.org/r/125754/diff/
> 
> 
> Testing
> -------
> 
> Compiles now.
> 
> 
> Thanks,
> 
> David Kahles
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20151022/2d4dfe1c/attachment.html>