diff --git a/app/main.cpp b/app/main.cpp index 55df439..28c71e1 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 11f836e..5165c25 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -103,12 +103,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..5da5047 160000 --- a/qmltermwidget +++ b/qmltermwidget @@ -1 +1 @@ -Subproject commit 08958f7c83a7d05627f623b8904f3e79a0b7366b +Subproject commit 5da50472e385537879b6e733bc89972c0ed0ec13