Commit 272c8f7f authored by Kurt Hindenburg's avatar Kurt Hindenburg

Q_OS_MAC -> Q_OS_OSX

Q_OS_MAC includes OSX and iOS

Patch from rjvbertin gmail com
parent 527d2606
......@@ -45,11 +45,11 @@
#include <KUser>
#include <QDebug>
#if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_MAC)
#if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_OSX)
#include <sys/sysctl.h>
#endif
#if defined(Q_OS_MAC)
#if defined(Q_OS_OSX)
#include <libproc.h>
#include <qplatformdefs.h>
#endif
......@@ -878,7 +878,7 @@ private:
}
};
#elif defined(Q_OS_MAC)
#elif defined(Q_OS_OSX)
class MacProcessInfo : public UnixProcessInfo
{
public:
......@@ -1184,7 +1184,7 @@ ProcessInfo* ProcessInfo::newInstance(int aPid, const QString& titleFormat, bool
return new LinuxProcessInfo(aPid, titleFormat, enableEnvironmentRead);
#elif defined(Q_OS_SOLARIS)
return new SolarisProcessInfo(aPid, titleFormat, enableEnvironmentRead);
#elif defined(Q_OS_MAC)
#elif defined(Q_OS_OSX)
return new MacProcessInfo(aPid, titleFormat, enableEnvironmentRead);
#elif defined(Q_OS_FREEBSD)
return new FreeBSDProcessInfo(aPid, titleFormat, enableEnvironmentRead);
......
......@@ -56,7 +56,7 @@ class HistoryType;
* Platform-specific main shortcut "opcode":
*/
enum Modifier {
#ifdef Q_OS_MAC
#ifdef Q_OS_OSX
ACCEL = Qt::META
#else
ACCEL = Qt::CTRL
......
......@@ -726,7 +726,7 @@ void TerminalDisplay::drawBackground(QPainter& painter, const QRect& rect, const
if (useOpacitySetting && !_wallpaper->isNull() &&
_wallpaper->draw(painter, contentsRect, _opacity)) {
} else if (qAlpha(_blendColor) < 0xff && useOpacitySetting) {
#if defined(Q_OS_MAC)
#if defined(Q_OS_OSX)
// TODO - On MacOS, using CompositionMode doesn't work. Altering the
// transparency in the color scheme alters the brightness.
painter.fillRect(contentsRect, backgroundColor);
......
......@@ -81,7 +81,7 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[])
// enable high dpi support
app->setAttribute(Qt::AA_UseHighDpiPixmaps, true);
#if defined(Q_OS_MAC)
#if defined(Q_OS_OSX)
// this ensures that Ctrl and Meta are not swapped, so CTRL-C and friends
// will work correctly in the terminal
app->setAttribute(Qt::AA_MacDontSwapCtrlAndMeta);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment