From 17f37b48e7920e8c13721bd9e06ec00aad27367e Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Sun, 21 Dec 2014 16:19:23 +0100 Subject: [PATCH] Fix: autologin the shell under OSX. --- app/qml/PreprocessedTerminal.qml | 7 ++++++- qmltermwidget | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/qml/PreprocessedTerminal.qml b/app/qml/PreprocessedTerminal.qml index 8c3a522..0c28138 100644 --- a/app/qml/PreprocessedTerminal.qml +++ b/app/qml/PreprocessedTerminal.qml @@ -127,8 +127,13 @@ Item{ appSettings.terminalFontChanged.connect(handleFontChange); // Retrieve the variable set in main.cpp if arguments are passed. - if (shellProgram) + if (shellProgram) { ksession.setShellProgram(shellProgram); + } else if (!shellProgram && Qt.platform.os === "osx") { + // OSX Requires the following default parameters for auto login. + ksession.setArgs(["-i", "-l"]); + } + if (workdir) ksession.initialWorkingDirectory = workdir; diff --git a/qmltermwidget b/qmltermwidget index b003cff..71f2f3f 160000 --- a/qmltermwidget +++ b/qmltermwidget @@ -1 +1 @@ -Subproject commit b003cff04f5891abe15086e946a0630e66efb242 +Subproject commit 71f2f3f9f0db5ad42e7b39596e968be110e70267