[KDE/Mac] Review Request 121383: [OS X] make it build again

[René J.V. Bertin]

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



qt5/style/qtcurve_plugin.cpp
<https://git.reviewboard.kde.org/r/121383/#comment49898>

    For some reason, Q_WS_X11 is NOT defined when building for Qt5/KF5 on Linux. It does seem to be defined in the GTk2 branch.
    
    The best compromise I have found for now is to replace
    
    `#ifdef Q_WS_X11`
    
    with
    
    `#if defined(Q_OS_UNIX) && !defined(Q_OS_OSX)`
    
    assuming that there are no other platforms where Q_OS_UNIX is defined by where X11 is not the windowing/displaying system.
    
    Using this in all files under Qt5 it builds for me under KUbuntu 14.04 using Project Neon5 (about the latest version that was made available before that project was discontinued).
    
    I only get a runtime warning
    
    `cannot find .rc file "QtCurveui.rc" for component "QtCurve"`
    
    as well as 
    
    `Your code needs to be ported in KF5.  See the Ki18n programmers guide.`
    
    that are probably not related to X11 issues.


- René J.V. Bertin


On Dec. 7, 2014, 10:14 p.m., René J.V. Bertin wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/121383/
> -----------------------------------------------------------
> 
> (Updated Dec. 7, 2014, 10:14 p.m.)
> 
> 
> Review request for KDE Software on Mac OS X and Yichao Yu.
> 
> 
> Repository: qtcurve
> 
> 
> Description
> -------
> 
> Recent changes have reintroduced a large number of dependencies on X11 which are inappropriate in the Qt plugins on Mac OS X. This patch filters out the missing calls when `Q_WS_X11` is not defined.
> Other small tweaks and remarks:
> - getline is missing only from OS X < 10.7, so I added an OS version check
> - the CMakeLists.txt file tries to detect Qt4 when ENABLE_QT4 is not defined on the commandline. Qt4 is found but apparently this is not verified correctly and thus the build fails. I have not (yet) been able to correct this.
> 
> PS: QtCurve is currently the default KDE theme on OS X; it'd be nice if people remembered that and put the appropriate #ifdefs around X11 code! ;)
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt 0c389eb 
>   gtk2/common/config_file.c ac900d5 
>   gtk2/style/qt_settings.c e4671eb 
>   lib/utils/CMakeLists.txt 984bc74 
>   qt4/CMakeLists.txt 23255f4 
>   qt4/style/blurhelper.cpp 64e00e1 
>   qt4/style/shadowhelper.cpp 7d6711c 
>   qt4/style/windowmanager.cpp 2517c66 
>   qt5/style/blurhelper.cpp b6719b8 
>   qt5/style/qtcurve.cpp ac93633 
>   qt5/style/qtcurve_plugin.cpp 1420a03 
>   qt5/style/qtcurve_utils.cpp a063133 
>   qt5/style/shadowhelper.cpp 48ace73 
>   qt5/style/utils.cpp bf54960 
>   qt5/style/windowmanager.cpp c48e4fe 
> 
> Diff: https://git.reviewboard.kde.org/r/121383/diff/
> 
> 
> Testing
> -------
> 
> On OS X 10.9.4 with KDE4+Qt4+GTk2/MacPorts and Qt 5.3.2 installed with a Digia installer.
> 
> 
> Thanks,
> 
> René J.V. Bertin
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-mac/attachments/20141208/e1008e9d/attachment.html>