diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-02 10:18:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-02 10:18:59 (GMT) |
| commit | cf0917cfc3b040e9650953560038f92cac42b6e3 (patch) | |
| tree | fd07fb7b34f7477702a1b9bbdb656a33e245c3bb /src | |
| parent | 4b05255a970e33f471345c826cab5a857a3a83f8 (diff) | |
| parent | 389921022ea903c1a3eab6e110afd9bff49e719b (diff) | |
| download | Qt-cf0917cfc3b040e9650953560038f92cac42b6e3.zip Qt-cf0917cfc3b040e9650953560038f92cac42b6e3.tar.gz Qt-cf0917cfc3b040e9650953560038f92cac42b6e3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Revert "QLineEdit cursor is shown when asked to be non-visible"
Fixed Symbian builds after introduction of boilerplate code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/global.pri | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
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\')\\\" 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); } } |