[KDE/Mac] OSX/CI: Uses of outdated Q_WS_MAC in KF5 projects

[Marko Käning]

Hi Ian,
Hi Ben,

On 22 Jan 2015, at 09:41 , Ian Wadham <iandw.au at gmail.com> wrote:
> Good work.

thanks.


> Have you had a look in the Frameworks libraries?

My search went over all frameworks and projects (currently being covered by the
OSX/CI system):
---
$ find /Users/marko/WC/KDECI-builds/kf5-qt5 -name "*.h" -exec grep -H Q_WS_MAC {} \;
/Users/marko/WC/KDECI-builds/kf5-qt5/calligra/krita/ui/input/wintab/kis_tablet_support.h:#ifndef Q_WS_MAC
/Users/marko/WC/KDECI-builds/kf5-qt5/calligra/krita/ui/input/wintab/kis_tablet_support.h:#if defined(Q_WS_X11) || (defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA))
/Users/marko/WC/KDECI-builds/kf5-qt5/calligra/krita/ui/input/wintab/kis_tablet_support.h:#elif defined(Q_WS_MAC)
/Users/marko/WC/KDECI-builds/kf5-qt5/calligra/krita/ui/input/wintab/kis_tablet_support.h:#ifndef Q_WS_MAC
/Users/marko/WC/KDECI-builds/kf5-qt5/calligra/krita/ui/opengl/kis_opengl.h:#ifdef Q_WS_MAC
/Users/marko/WC/KDECI-builds/kf5-qt5/kdelibs/kdeui/util/kkeyserver.h:#elif defined Q_WS_MACX
/Users/marko/WC/KDECI-builds/kf5-qt5/kdelibs/kdeui/windowmanagement/kwindowinfo.h:#ifdef Q_WS_MAC
/Users/marko/WC/KDECI-builds/kf5-qt5/kdelibs/kinit/klauncher.h:#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
---
Those currently found are in Qt4/KDE4 code only.

Here I skip KDE4 projects as well as Qt5 stuff:
---
$ find /Users/marko/WC/KDECI-builds/kf5-qt5 -name “*.cpp" -exec grep -H Q_WS_MAC {} \;
/Users/marko/WC/KDECI-builds/kf5-qt5/grantlee/examples/textedit/textedit.cpp:#ifdef Q_WS_MAC
/Users/marko/WC/KDECI-builds/kf5-qt5/knotifications/src/knotificationmanager.cpp:    #ifndef Q_WS_MAC
/Users/marko/WC/KDECI-builds/kf5-qt5/ktexteditor/src/view/kateviewinternal.cpp:#ifdef Q_WS_MAC
/Users/marko/WC/KDECI-builds/kf5-qt5/lokalize/src/lokalizemainwindow.cpp:#ifndef Q_WS_MAC
---
For the last three I have made commits to master, but they aren’t on my OSX/CI system’s
branch ‘jenkins’ yet. Don’t know why. [Ben?]

And: Obviously I missed grantlee last night.


> There are quite a few Q_WS_MAC[X]* occurrences in kdelibs
> for KDE 4, especially in kdeinit and friends, which is where I
> noticed them back in July.  So maybe there are some lurking
> in Frameworks…

I am aware of this Q_WS_MACX variable and it is being found be my command.

I had only once such occurrence and I have changed it to Q_OS_MAC as well hoping it's okay.

Regards,
Marko