adjust to qt 5.12 for sierra, fix file opening on macOS

orion-project · Feb 10, 2022 · 3723b48 · 3723b48
1 parent 03065e4
commit 3723b48
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 8 deletions.
diff --git a/src/HelpSystem.cpp b/src/HelpSystem.cpp
@@ -184,7 +184,12 @@ void HelpSystem::checkUpdates()
         _updateChecker = nullptr;
         versionReceived(versionData);
     });
-    connect(_updateReply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::errorOccurred), [this](QNetworkReply::NetworkError){
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+    connect(_updateReply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::errorOccurred),
+#else
+    connect(_updateReply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error),
+#endif
+            [this](QNetworkReply::NetworkError){
         auto errorMsg =_updateReply->errorString();
         qCritical() << "Network error" << errorMsg;
         _updateReply->deleteLater();

diff --git a/src/MemoWindow.cpp b/src/MemoWindow.cpp
@@ -163,7 +163,11 @@ struct MemoTextFormat
     {
         QTextCharFormat f;
         if (!_fontFamily.isEmpty())
+        #if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
             f.setFontFamilies({_fontFamily});
+        #else
+            f.setFontFamily(_fontFamily);
+        #endif
         if (!_colorName.isEmpty())
             f.setForeground(QColor(_colorName));
         if (_bold)
@@ -675,7 +679,9 @@ void MemoWindow::insertTable()
         fmt.setCellSpacing(0);
         fmt.setBorderBrush(Qt::black);
         fmt.setBorderStyle(QTextFrameFormat::BorderStyle_Solid);
+      #if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
         fmt.setBorderCollapse(true);
+      #endif
         _editor->textCursor().insertTable(rows->value(), cols->value(), fmt);
     }
 }

diff --git a/src/ProjectOperations.cpp b/src/ProjectOperations.cpp
@@ -118,11 +118,23 @@ void ProjectOperations::openSchemaFile(const QString& fileName, const OpenFileOp
     if (!schema()->state().isNew())
     {
         QStringList args;
+#ifdef Q_OS_MAC
+        QString exe = qApp->applicationFilePath();
+        if (opts.isExample)
+            args << "--example";
+        args << fileName;
+        bool ok = QProcess::startDetached(exe, args);
+        if (!ok)
+            qWarning() << "Unable to start another instance" << exe << args.join(' ');
+#else
         args << qApp->applicationFilePath();
         if (opts.isExample)
             args << "--example";
         args << " \"" + fileName + "\"";
-        QProcess::startDetached(args.join(' '), {});
+        bool ok = QProcess::startDetached(args.join(' '), {});
+        if (!ok)
+            qWarning() << "Unable to start another instance" << args.join(' ');
+#endif
         return;
     }
 

diff --git a/src/core/ElementFormula.cpp b/src/core/ElementFormula.cpp
@@ -1,5 +1,6 @@
 #include "ElementFormula.h"
 
+#include "Utils.h"
 #include "LuaHelper.h"
 
 #include <QApplication>
@@ -152,7 +153,7 @@ void ElemFormula::moveParamUp(Z::Parameter* param)
         _params.append(param);
     }
     else
-        _params.swapItemsAt(index, index-1);
+        swapItems(_params, index, index-1);
 }
 
 void ElemFormula::moveParamDown(Z::Parameter* param)
@@ -169,7 +170,7 @@ void ElemFormula::moveParamDown(Z::Parameter* param)
         _params.insert(0, param);
     }
     else
-        _params.swapItemsAt(index, index+1);
+        swapItems(_params, index, index+1);
 }
 
 void ElemFormula::assign(const ElemFormula* other)

diff --git a/src/core/Schema.cpp b/src/core/Schema.cpp
@@ -391,7 +391,7 @@ void Schema::shiftElement(int index, const std::function<int(int)>& getTargetInd
 {
     if (!isValid(index)) return;
     if (_items.size() == 1) return;
-    _items.swapItemsAt(index, getTargetIndex(index));
+    swapItems(_items, index, getTargetIndex(index));
     relinkInterfaces();
     _events.raise(SchemaEvents::Rebuilt, "Schema: shiftElement");
     _events.raise(SchemaEvents::RecalRequred, "Schema: shiftElement");
@@ -416,7 +416,7 @@ void Schema::flip()
     int size = _items.size();
     if (size < 2) return;
     for (int i = 0; i < size / 2; i++)
-        _items.swapItemsAt(i, size - 1 - i);
+        swapItems(_items, i, size - 1 - i);
     relinkInterfaces();
     _events.raise(SchemaEvents::Rebuilt, "Schema: flip");
     _events.raise(SchemaEvents::RecalRequred, "Schema: flip");

diff --git a/src/core/Utils.h b/src/core/Utils.h
@@ -51,4 +51,14 @@ template <typename T> struct Optional {
 
 } // namespace Z
 
+template <typename TList> void swapItems(TList& list, int i, int j)
+{
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+    list.swapItemsAt(i, j);
+#else
+    list.swap(i, j);
+#endif
+}
+
+
 #endif // Z_UTILS_H
diff --git a/src/tests/test_UnitWidgets.cpp b/src/tests/test_UnitWidgets.cpp
@@ -10,7 +10,11 @@ namespace UnitWidgetsTests {
 
 template <typename T> QSet<T> listToSet(const QList<T>& list)
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
     return QSet<T>(list.begin(), list.end());
+#else
+    return list.toSet();
+#endif
 }
 
 //------------------------------------------------------------------------------

diff --git a/src/widgets/ParamsEditor.cpp b/src/widgets/ParamsEditor.cpp
@@ -4,6 +4,7 @@
 #include "helpers/OriLayouts.h"
 #include "widgets/OriInfoPanel.h"
 #include "widgets/OriValueEdit.h"
+#include "../core/Utils.h"
 
 //------------------------------------------------------------------------------
 //                                ParamsEditor
@@ -242,7 +243,7 @@ void ParamsEditor::moveEditorUp(Z::Parameter* param)
             else
             {
                 _paramsLayout->insertWidget(i-1, editor);
-                _editors.swapItemsAt(i, i-1);
+                swapItems(_editors, i, i-1);
             }
             break;
         }
@@ -267,7 +268,7 @@ void ParamsEditor::moveEditorDown(Z::Parameter* param)
             else
             {
                 _paramsLayout->insertWidget(i+1, editor);
-                _editors.swapItemsAt(i, i+1);
+                swapItems(_editors, i, i+1);
             }
             break;
         }