From e678c2469c875cc4aa3ae9cf284ce130892b664d Mon Sep 17 00:00:00 2001
From: Martin Dvorak <martin.dvorak@mindforger.com>
Date: Tue, 6 Feb 2024 08:57:42 +0100
Subject: [PATCH] Fixing APPLE-L shortcut clash + .dmg upgrade to Qt 5.15.2 LTS

---
 app/src/qt/note_edit_view.cpp             | 2 +-
 app/src/qt/outline_header_edit_view.cpp   | 2 +-
 app/src/qt/widgets/edit_buttons_panel.cpp | 2 +-
 build/macos/env.sh                        | 7 +++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/qt/note_edit_view.cpp b/app/src/qt/note_edit_view.cpp
index 49aad660..1c2ff8e7 100644
--- a/app/src/qt/note_edit_view.cpp
+++ b/app/src/qt/note_edit_view.cpp
@@ -42,7 +42,7 @@ NoteEditView::NoteEditView(QWidget* parent)
     // signals
 #ifdef __APPLE__
     new QShortcut(
-        QKeySequence(Qt::CTRL+Qt::Key_L),
+        QKeySequence(Qt::CTRL+Qt::Key_D),
         this, SLOT(slotSaveAndCloseEditor()));
 #else
     // TODO leak?
diff --git a/app/src/qt/outline_header_edit_view.cpp b/app/src/qt/outline_header_edit_view.cpp
index eb0e07af..cb032cea 100644
--- a/app/src/qt/outline_header_edit_view.cpp
+++ b/app/src/qt/outline_header_edit_view.cpp
@@ -40,7 +40,7 @@ OutlineHeaderEditView::OutlineHeaderEditView(QWidget* parent)
     // signals
 #ifdef __APPLE__
     new QShortcut(
-        QKeySequence(Qt::CTRL+Qt::Key_L),
+        QKeySequence(Qt::CTRL+Qt::Key_D),
         this, SLOT(slotSaveAndCloseEditor()));
 #else
     new QShortcut(
diff --git a/app/src/qt/widgets/edit_buttons_panel.cpp b/app/src/qt/widgets/edit_buttons_panel.cpp
index 08b5d358..4f772b89 100644
--- a/app/src/qt/widgets/edit_buttons_panel.cpp
+++ b/app/src/qt/widgets/edit_buttons_panel.cpp
@@ -48,7 +48,7 @@ EditButtonsPanel::EditButtonsPanel(MfWidgetMode mode, QWidget* parent)
 
     rememberAndLeaveButton = new QPushButton{tr("Remember and Leave"), this};
 #ifdef __APPLE__
-    rememberAndLeaveButton->setToolTip("⌘L");
+    rememberAndLeaveButton->setToolTip("⌘D");  // like DONE (⌘L used for link completion in N editor)
 #else
     rememberAndLeaveButton->setToolTip("Alt+Left");
 #endif
diff --git a/build/macos/env.sh b/build/macos/env.sh
index 2f70c5b6..d85401ae 100644
--- a/build/macos/env.sh
+++ b/build/macos/env.sh
@@ -20,12 +20,11 @@
 export MINDFORGER_VERSION="2.0.0"
 
 # aligned with Ubuntu 18.4
-export QT_VERSION="5.9.9"
+# export QT_VERSION="5.9.9"
 # MindForger 1.52.0 released for macOS Qt version
 # export QT_VERSION="5.11.0"
-# BUG: unable to set security - images are NOT loaded with Qt 5.15.2
-# export QT_VERSION="5.15.2"
-
+# Qt 5.15.2 is LTS & works well on macOS BigSur 11.6
+export QT_VERSION="5.15.2"
 
 export PATH="/Users/dvorka/Qt/${QT_VERSION}/clang_64/bin":${PATH}