diff --git a/src/apps/deskflow-gui/deskflow-gui.cpp b/src/apps/deskflow-gui/deskflow-gui.cpp index 29662f186..79af05e38 100644 --- a/src/apps/deskflow-gui/deskflow-gui.cpp +++ b/src/apps/deskflow-gui/deskflow-gui.cpp @@ -32,7 +32,7 @@ #include #endif -#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN) +#if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN) #include "platform/XDGPortalRegistry.h" #endif @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) QLoggingCategory::setFilterRules(QStringLiteral("*.debug=true\nqt.*=false")); #endif -#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN) +#if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN) if (QT_VERSION < QT_VERSION_CHECK(6, 10, 0)) deskflow::platform::setAppId(); #endif diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp index 1fba5a86d..334848ec7 100644 --- a/src/lib/deskflow/App.cpp +++ b/src/lib/deskflow/App.cpp @@ -22,7 +22,7 @@ #include -#if defined(Q_OS_MAC) +#if defined(Q_OS_MACOS) #include #endif diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp index 3f8d1c06c..abd49ee90 100644 --- a/src/lib/deskflow/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -37,7 +37,7 @@ #include "platform/EiScreen.h" #endif -#if defined(Q_OS_MAC) +#if defined(Q_OS_MACOS) #include "platform/OSXScreen.h" #endif @@ -108,7 +108,7 @@ deskflow::Screen *ClientApp::createScreen() ), getEvents() ); -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_MACOS) return new deskflow::Screen( new OSXScreen(getEvents(), false, Settings::value(Settings::Client::LanguageSync).toBool()), getEvents() ); diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp index 5c89b1c48..8d8196312 100644 --- a/src/lib/deskflow/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -43,7 +43,7 @@ #include "platform/EiScreen.h" #endif -#if defined(Q_OS_MAC) +#if defined(Q_OS_MACOS) #include "platform/OSXScreen.h" #endif @@ -393,7 +393,7 @@ deskflow::Screen *ServerApp::createScreen() return new deskflow::Screen( new MSWindowsScreen(true, Settings::value(Settings::Core::UseHooks).toBool(), getEvents()), getEvents() ); -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_MACOS) return new deskflow::Screen(new OSXScreen(getEvents(), true), getEvents()); #else if (deskflow::platform::isWayland()) { diff --git a/src/lib/deskflow/unix/AppUtilUnix.cpp b/src/lib/deskflow/unix/AppUtilUnix.cpp index 15cd7ac50..bcd53b9ae 100644 --- a/src/lib/deskflow/unix/AppUtilUnix.cpp +++ b/src/lib/deskflow/unix/AppUtilUnix.cpp @@ -14,7 +14,7 @@ #if WINAPI_XWINDOWS #include #include -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_MACOS) #include #include #endif @@ -46,7 +46,7 @@ std::vector AppUtilUnix::getKeyboardLayoutList() #if WINAPI_XWINDOWS layoutLangCodes = XkbLayoutsParser::getXkbLanguageList(); -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_MACOS) CFStringRef keys[] = {kTISPropertyInputSourceCategory}; CFStringRef values[] = {kTISCategoryKeyboardInputSource}; AutoCFDictionary dict( @@ -142,7 +142,7 @@ std::string AppUtilUnix::getCurrentLanguageCode() result = XkbLayoutsParser::convertLayoutToISO(result); -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_MACOS) AutoTISInputSourceRef source(nullptr, CFRelease); CFArrayRef layoutLanguages = nullptr; { diff --git a/src/lib/gui/StyleUtils.h b/src/lib/gui/StyleUtils.h index 6cc335f45..b9d7c3bb6 100644 --- a/src/lib/gui/StyleUtils.h +++ b/src/lib/gui/StyleUtils.h @@ -60,7 +60,7 @@ inline QFont fixedFont() QFont f = QFontDatabase::systemFont(QFontDatabase::FixedFont); #endif -#if defined(Q_OS_MAC) +#if defined(Q_OS_MACOS) f.setPointSize(12); #endif return f;