From 17b70b47ced3cc224f492961a97eec05c44f8a99 Mon Sep 17 00:00:00 2001
From: Filippo Scognamiglio <flscogna@gmail.com>
Date: Mon, 5 Jan 2015 22:35:07 +0100
Subject: [PATCH] Fix OSX keys issues.

---
 app/main.cpp  | 10 ++++++++++
 qmltermwidget |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/main.cpp b/app/main.cpp
index 2010de5..ad082c0 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -24,7 +24,16 @@ QString getNamedArgument(QStringList args, QString name)
 
 int main(int argc, char *argv[])
 {
+    // Some environmental variable are necessary on certain platforms.
+
+    // This disables QT appmenu under Ubuntu, which is not working with QML apps.
     setenv("QT_QPA_PLATFORMTHEME", "", 1);
+
+#if defined(Q_OS_MAC)
+    // This allows UTF-8 characters usage in OSX.
+    setenv("LC_CTYPE", "UTF-8", 1);
+#endif
+
     QApplication app(argc, argv);
     QQmlApplicationEngine engine;
     FileIO fileIO;
@@ -60,6 +69,7 @@ int main(int argc, char *argv[])
     QStringList importPathList = engine.importPathList();
     importPathList.prepend(QCoreApplication::applicationDirPath() + "/qmltermwidget");
     importPathList.prepend(QCoreApplication::applicationDirPath() + "/../PlugIns");
+    importPathList.prepend(QCoreApplication::applicationDirPath() + "/../../../qmltermwidget");
     engine.setImportPathList(importPathList);
 
     engine.load(QUrl("qrc:/main.qml"));
diff --git a/qmltermwidget b/qmltermwidget
index b03e96e..4b3fd27 160000
--- a/qmltermwidget
+++ b/qmltermwidget
@@ -1 +1 @@
-Subproject commit b03e96edb5d984040b1816edee8f1f51eadbaff9
+Subproject commit 4b3fd2729bac10a8e292bcf027737509d10e9c74