From 654f8d0761da016659a7d0b2212a468608d83825 Mon Sep 17 00:00:00 2001
From: spuch <picospuch@gmail.com>
Date: Tue, 6 Mar 2018 17:33:30 +0800
Subject: [PATCH] fix alt(meta), ctrl for emacs on macos

---
 app/main.cpp     | 4 ++++
 app/qml/main.qml | 4 ++--
 qmltermwidget    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/main.cpp b/app/main.cpp
index 7c0bb51..a6268b4 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -36,6 +36,10 @@ int main(int argc, char *argv[])
 #endif
 
     QApplication app(argc, argv);
+    // set application attributes
+    // Has no effects, see https://bugreports.qt.io/browse/QTBUG-51293
+    // app.setAttribute(Qt::AA_MacDontSwapCtrlAndMeta, true);
+
     QQmlApplicationEngine engine;
     FileIO fileIO;
 
diff --git a/app/qml/main.qml b/app/qml/main.qml
index ed0801c..8a9d620 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -101,12 +101,12 @@ ApplicationWindow{
     Action{
         id: copyAction
         text: qsTr("Copy")
-        shortcut: Qt.platform.os === "osx" ? StandardKey.Copy : "Ctrl+Shift+C"
+        shortcut: "Ctrl+Shift+C"
     }
     Action{
         id: pasteAction
         text: qsTr("Paste")
-        shortcut: Qt.platform.os === "osx" ? StandardKey.Paste : "Ctrl+Shift+V"
+        shortcut: "Ctrl+Shift+V"
     }
     Action{
         id: zoomIn
diff --git a/qmltermwidget b/qmltermwidget
index 08958f7..214eeef 160000
--- a/qmltermwidget
+++ b/qmltermwidget
@@ -1 +1 @@
-Subproject commit 08958f7c83a7d05627f623b8904f3e79a0b7366b
+Subproject commit 214eeefc2a1293a5d7d3da77e853e931103a1428