kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

MacOS: Modify OS detection macro (#15924)

Browse Source 
* Fixes #15904
* MacOS: Always use Q_OS_MACOS to detect MacOS because the Conda builds do not define Q_OS_APPLE
This commit is contained in:
Chris Hennes
2024-08-18 08:29:40 -05:00
committed by GitHub
parent 95c514fca3
commit ff1409d8bf
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/Assistant.cpp
View File

@@ -80,7 +80,7 @@ bool Assistant::startAssistant()
QString app;
app = QDir::toNativeSeparators(QString::fromStdString
(App::Application::getHomePath()) + QLatin1String("bin/"));
#elif defined(Q_OS_APPLE)
#elif defined(Q_OS_MACOS)
QString app = QCoreApplication::applicationDirPath() + QDir::separator();
#else
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)

2
src/Gui/PythonConsole.cpp
View File

@@ -1264,7 +1264,7 @@ void PythonConsole::runSourceFromMimeData(const QString& source)
#elif defined(Q_OS_WIN32)
// Need to convert CRLF to LF
text.replace(QLatin1String("\r\n"), QLatin1String("\n"));
#elif defined(Q_OS_APPLE)
#elif defined(Q_OS_MACOS)
//need to convert CR to LF
text.replace(QLatin1Char('\r'), QLatin1Char('\n'));
#endif

6
src/Gui/SoFCCSysDragger.cpp
View File

@@ -96,7 +96,7 @@ TDragger::TDragger()
{
SO_KIT_CONSTRUCTOR(TDragger);
#if defined(Q_OS_APPLE)
#if defined(Q_OS_MACOS)
this->ref();
#endif
@@ -400,7 +400,7 @@ void TPlanarDragger::initClass()
TPlanarDragger::TPlanarDragger()
{
SO_KIT_CONSTRUCTOR(TPlanarDragger);
#if defined(Q_OS_APPLE)
#if defined(Q_OS_MACOS)
this->ref();
#endif
@@ -698,7 +698,7 @@ void RDragger::initClass()
RDragger::RDragger()
{
SO_KIT_CONSTRUCTOR(RDragger);
#if defined(Q_OS_APPLE)
#if defined(Q_OS_MACOS)
this->ref();
#endif

4
src/Gui/ToolHandler.cpp
View File

@@ -123,7 +123,7 @@ void ToolHandler::setSvgCursor(const QString& cursorName,
qreal defaultCursorSize = isRatioOne ? 64 : 32;
qreal hotX = x;
qreal hotY = y;
#if !defined(Q_OS_WIN32) && !defined(Q_OS_APPLE)
#if !defined(Q_OS_WIN32) && !defined(Q_OS_MACOS)
if (qGuiApp->platformName() == QLatin1String("xcb")) {
hotX *= pRatio;
hotY *= pRatio;
@@ -157,7 +157,7 @@ void ToolHandler::setCursor(const QPixmap& p, int x, int y, bool autoScale)
p1.setDevicePixelRatio(pRatio);
qreal hotX = x;
qreal hotY = y;
#if !defined(Q_OS_WIN32) && !defined(Q_OS_APPLE)
#if !defined(Q_OS_WIN32) && !defined(Q_OS_MACOS)
if (qGuiApp->platformName() == QLatin1String("xcb")) {
hotX *= pRatio;
hotY *= pRatio;