From cbe62050c28bae3b1f251be72e28cfe509cea14c Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Wed, 1 Sep 2010 15:44:47 +0200
Subject: Fixed Symbian builds after introduction of boilerplate code.

Hopefully the linux-armcc and linux-gcce mkspecs will be renamed
later, but until then, we need this fix.

RevBy:    Trust me
---
 src/corelib/global/global.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index 2505e72..260ed59 100644
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -19,7 +19,7 @@ INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
 # Only used on platforms with CONFIG += precompile_header
 PRECOMPILED_HEADER = global/qt_pch.h
 
-linux*:!static {
+linux*:!static:!linux-armcc:!linux-gcce {
    QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate
    prog=$$quote(if (/program interpreter: (.*)]/) { print $1; })
    DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\"
-- 
cgit v0.12


From 389921022ea903c1a3eab6e110afd9bff49e719b Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Thu, 2 Sep 2010 09:47:37 +0200
Subject: Revert "QLineEdit cursor is shown when asked to be non-visible"

This reverts commit 9ef61d3d1e53d32dc2568cbfb9f8ff5b19cb4ffc.
---
 src/gui/widgets/qlinecontrol.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index 69e6791..b6dfd13 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -464,8 +464,6 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event)
         if (a.type == QInputMethodEvent::Cursor) {
             m_preeditCursor = a.start;
             m_hideCursor = !a.length;
-            if (m_hideCursor)
-                setCursorBlinkPeriod(0);
         } else if (a.type == QInputMethodEvent::TextFormat) {
             QTextCharFormat f = qvariant_cast<QTextFormat>(a.value).toCharFormat();
             if (f.isValid()) {
@@ -529,7 +527,7 @@ void QLineControl::draw(QPainter *painter, const QPoint &offset, const QRect &cl
         int cursor = m_cursor;
         if (m_preeditCursor != -1)
             cursor += m_preeditCursor;
-        if (!m_hideCursor && (!m_blinkPeriod || m_blinkStatus))
+        if(!m_blinkPeriod || m_blinkStatus)
             m_textLayout.drawCursor(painter, offset, cursor, m_cursorWidth);
     }
 }
-- 
cgit v0.12