Review Request 115723: Use Q_OS_UNIX instead of HAVE_X11 to determine the platform we are on

[Alexander Richardson]

> On Feb. 13, 2014, 11:27 p.m., Alexander Richardson wrote:
> > src/core/kprotocolmanager.cpp, line 690
> > <https://git.reviewboard.kde.org/r/115723/diff/1/?file=243874#file243874line690>
> >
> >     Maybe move the Q_OS_MAC up as the first check, then there is no need for !defined(Q_OS_DARWIN)
> 
> Martin Gräßlin wrote:
>     I considered that when doing the change, but decided against it as
>     * I don't want to reorder
>     * are afraid of introducing a bug (after all I can only compile check one variant and the CI system as well)
>     * it's a common pattern I have seen in kde-workspaces
>     
>     So overall I considered just changing the first condition as the better solution.

Sure, feel free to commit the current patch


- Alexander


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


On Feb. 13, 2014, 2:03 p.m., Martin Gräßlin wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/115723/
> -----------------------------------------------------------
> 
> (Updated Feb. 13, 2014, 2:03 p.m.)
> 
> 
> Review request for KDE Frameworks, Dawit Alemayehu and Bernhard Beschow.
> 
> 
> Repository: kio
> 
> 
> Description
> -------
> 
> Use Q_OS_UNIX instead of HAVE_X11 to determine the platform we are on
> 
> We cannot properly determine the windowing system platform on unix
> like systems in kprotocolmanager as it's not linking gui. Thus we
> don't know whether we are on X11 or Wayland and there is no proper
> way to figure it out, because both DISPLAY and WAYLAND_DISPLAY could
> be defined.
> 
> As a solution we just force the platform to be always X11 when we
> are on unix like systems (modulo mac).
> 
> 
> Diffs
> -----
> 
>   src/core/kprotocolmanager.cpp f81b6797887eebd868c36b98e867eb055b05a1e2 
> 
> Diff: https://git.reviewboard.kde.org/r/115723/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Martin Gräßlin
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140214/d8873be0/attachment.html>