kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-22 09:40:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix macOS Deprecated synonym for Q_OS_DARWIN

Browse Source
This commit is contained in:
Laurent Trinques
2023-02-25 14:28:02 +01:00
parent ec3ac92b5e
commit 047462f226
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/dxf/dxftoelmt.cpp
View File

@@ -61,7 +61,7 @@ QString dxf2ElmtDirPath()
{ {
#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
return (QDir::homePath() + QStringLiteral("/Application Data/qet/binary")); return (QDir::homePath() + QStringLiteral("/Application Data/qet/binary"));
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MACOS)
return (QDir::homePath() + QStringLiteral("/.qet/binary")); return (QDir::homePath() + QStringLiteral("/.qet/binary"));
#else #else
return (QDir::homePath() + QStringLiteral("/.qet/binary")); return (QDir::homePath() + QStringLiteral("/.qet/binary"));
@@ -76,7 +76,7 @@ QString dxf2ElmtBinaryPath()
{ {
#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
return dxf2ElmtDirPath() + QStringLiteral("/dxf2elmt.exe"); return dxf2ElmtDirPath() + QStringLiteral("/dxf2elmt.exe");
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MACOS)
return dxf2ElmtDirPath() + QStringLiteral("/./dxf2elmt"); return dxf2ElmtDirPath() + QStringLiteral("/./dxf2elmt");
#else #else
return dxf2ElmtDirPath() + QStringLiteral("/dxf2elmt"); return dxf2ElmtDirPath() + QStringLiteral("/dxf2elmt");

4
sources/qetdiagrameditor.cpp
View File

@@ -2375,7 +2375,7 @@ void QETDiagramEditor::generateTerminalBlock()
success = process->startDetached(QDir::homePath() + "/qet_tb_generator.exe", {("")}); success = process->startDetached(QDir::homePath() + "/qet_tb_generator.exe", {("")});
} }
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MACOS)
if (openedProjects().count()){ if (openedProjects().count()){
success = process->startDetached("/Library/Frameworks/Python.framework/Versions/3.11/bin/qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())}); success = process->startDetached("/Library/Frameworks/Python.framework/Versions/3.11/bin/qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
} }
@@ -2424,7 +2424,7 @@ void QETDiagramEditor::generateTerminalBlock()
"<br>" "<br>"
" C:\\users\\XXXX\\AppData\\Local\\Programs\\Python\\Python36-32\\Scripts " " C:\\users\\XXXX\\AppData\\Local\\Programs\\Python\\Python36-32\\Scripts "
"<br>"); "<br>");
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MACOS)
QString message=QObject::tr( QString message=QObject::tr(
"To install the plugin qet_tb_generator" "To install the plugin qet_tb_generator"
"<br>Visit :" "<br>Visit :"