Review Request 121390: make Qt5 theme build on Linux again

[René J.V. Bertin]

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

(Updated Dec. 8, 2014, 10:59 p.m.)


Review request for KDE Frameworks, Qt KDE and Yichao Yu.


Changes
-------

The compile-time check now uses QtCurve's own `QTC_ENABLE_X11` token that is defined when building for X11.

My primary concern with this ticket is to restore something I broke; if Yichao would like me to add runtime-checks he is free to ask :)


Repository: qtcurve


Description
-------

Yesterday's patches for OS X building broke the build of the Qt5 parts on Linux (and other Unix/X11 platforms). I had presumed that Q_WS_X11 would be defined in that context as it is when building Qt4 code, but apparently it isn't.

This patch restores building on Unix/X11 by replacing

`#ifdef Q_WS_X11`

with

`#if defined(Q_OS_UNIX) && !defined(Q_OS_OSX)`

please verify if that catches all possible contexts where X11 is to be used?! (Qt/Cygwin might use X11?)


Diffs (updated)
-----

  qt5/style/blurhelper.cpp 5dcc95c 
  qt5/style/qtcurve.cpp 7b0d7e6 
  qt5/style/qtcurve_plugin.cpp febc977 
  qt5/style/qtcurve_utils.cpp 728c26a 
  qt5/style/shadowhelper.cpp a239cf1 
  qt5/style/utils.cpp 0680442 
  qt5/style/windowmanager.cpp 3c2bc1c 

Diff: https://git.reviewboard.kde.org/r/121390/diff/


Testing
-------

On KUbuntu 14.04 with Qt 5.3.2 and KF5 in the (sadly discontinued) Project Neon5 environment.


Thanks,

René J.V. Bertin

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20141208/2f18187c/attachment.htm>