From ee7afe2536c7078c0a29dd409b4317869670c170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Thu, 9 Sep 2010 13:27:24 +0200
Subject: Lighthouse Compilefix

---
 src/gui/kernel/qapplication_qpa.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qapplication_qpa.cpp b/src/gui/kernel/qapplication_qpa.cpp
index d432829..ece035c 100644
--- a/src/gui/kernel/qapplication_qpa.cpp
+++ b/src/gui/kernel/qapplication_qpa.cpp
@@ -68,6 +68,7 @@
 QT_BEGIN_NAMESPACE
 
 static QString appName;
+static QString appFont;
 
 QWidget *qt_button_down = 0;                     // widget got last button-down
 
@@ -522,7 +523,7 @@ void qt_init(QApplicationPrivate *priv, int type)
         QByteArray arg = argv[i];
         if (arg == "-fn" || arg == "-font") {
             if (++i < argc)
-                appFont = argv[i];
+                appFont = QString::fromLocal8Bit(argv[i]);
         } else if (arg == "-platform") {
             if (++i < argc)
                 platformName = QLatin1String(argv[i]);
-- 
cgit v0.12