Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:

10 files changed, 30 insertions, 119 deletions

diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/gui/inputmethod/qcoefepinputcontext_p.h
index 8c30838..9857015 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_p.h
+++ b/src/gui/inputmethod/qcoefepinputcontext_p.h
@@ -154,7 +154,6 @@ private:
     TUint m_textCapabilities;
     bool m_inDestruction;
     bool m_pendingInputCapabilitiesChanged;
-    bool m_pendingTransactionCancel;
     int m_cursorVisibility;
     int m_inlinePosition;
     MFepInlineTextFormatRetriever *m_formatRetriever;
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index bc27c1e..c3d293b 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -64,8 +64,6 @@
 #define QT_EAknCursorPositionChanged MAknEdStateObserver::EAknEdwinStateEvent(6)
 // MAknEdStateObserver::EAknActivatePenInputRequest
 #define QT_EAknActivatePenInputRequest MAknEdStateObserver::EAknEdwinStateEvent(7)
-// MAknEdStateObserver::EAknClosePenInputRequest
-#define QT_EAknClosePenInputRequest MAknEdStateObserver::EAknEdwinStateEvent(10)
 
 // EAknEditorFlagSelectionVisible is only valid from 3.2 onwards.
 // Sym^3 AVKON FEP manager expects that this flag is used for FEP-aware editors
@@ -109,7 +107,6 @@ QCoeFepInputContext::QCoeFepInputContext(QObject *parent)
       m_textCapabilities(TCoeInputCapabilities::EAllText),
       m_inDestruction(false),
       m_pendingInputCapabilitiesChanged(false),
-      m_pendingTransactionCancel(false),
       m_cursorVisibility(1),
       m_inlinePosition(0),
       m_formatRetriever(0),
@@ -255,6 +252,9 @@ bool QCoeFepInputContext::needsInputPanel()
 
 bool QCoeFepInputContext::filterEvent(const QEvent *event)
 {
+    // The CloseSoftwareInputPanel event is not handled here, because the VK will automatically
+    // close when it discovers that the underlying widget does not have input capabilities.
+
     if (!focusWidget())
         return false;
 
@@ -318,12 +318,6 @@ bool QCoeFepInputContext::filterEvent(const QEvent *event)
     if (!needsInputPanel())
         return false;
 
-    if ((event->type() == QEvent::CloseSoftwareInputPanel)
-        && (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0)) {
-        m_fepState->ReportAknEdStateEventL(QT_EAknClosePenInputRequest);
-        return false;
-    }
-
     if (event->type() == QEvent::RequestSoftwareInputPanel) {
         // Only request virtual keyboard if it is not yet active or if this is the first time
         // panel is requested for this application.
@@ -360,6 +354,10 @@ bool QCoeFepInputContext::filterEvent(const QEvent *event)
             if (sControl) {
                 sControl->setIgnoreFocusChanged(false);
             }
+            //If m_pointerHandler has already been set, it means that fep inline editing is in progress.
+            //When this is happening, do not filter out pointer events.
+            if (!m_pointerHandler)
+                return true;
         }
     }
 
@@ -476,7 +474,7 @@ void QCoeFepInputContext::resetSplitViewWidget(bool keepInputWidget)
 
     if (!alwaysResize) {
         if (gv->scene()) {
-            if (gv->scene()->focusItem() && S60->partial_keyboardAutoTranslation) {
+            if (gv->scene()->focusItem()) {
                 // Check if the widget contains cursorPositionChanged signal and disconnect from it.
                 QByteArray signal = QMetaObject::normalizedSignature(SIGNAL(cursorPositionChanged()));
                 int index = gv->scene()->focusItem()->toGraphicsObject()->metaObject()->indexOfSignal(signal.right(signal.length() - 1));
@@ -582,7 +580,7 @@ void QCoeFepInputContext::ensureFocusWidgetVisible(QWidget *widget)
     if (!moveWithinVisibleArea) {
         // Check if the widget contains cursorPositionChanged signal and connect to it.
         QByteArray signal = QMetaObject::normalizedSignature(SIGNAL(cursorPositionChanged()));
-        if (gv->scene() && gv->scene()->focusItem() && S60->partial_keyboardAutoTranslation) {
+        if (gv->scene() && gv->scene()->focusItem()) {
             int index = gv->scene()->focusItem()->toGraphicsObject()->metaObject()->indexOfSignal(signal.right(signal.length() - 1));
             if (index != -1)
                 connect(gv->scene()->focusItem()->toGraphicsObject(), SIGNAL(cursorPositionChanged()), this, SLOT(translateInputWidget()));
@@ -1071,24 +1069,15 @@ void QCoeFepInputContext::CancelFepInlineEdit()
     // We are not supposed to ever have a tempPreeditString and a real preedit string
     // from S60 at the same time, so it should be safe to rely on this test to determine
     // whether we should honor S60's request to clear the text or not.
-    if (m_hasTempPreeditString || m_pendingTransactionCancel)
+    if (m_hasTempPreeditString)
         return;
 
-    m_pendingTransactionCancel = true;
-
     QList<QInputMethodEvent::Attribute> attributes;
     QInputMethodEvent event(QLatin1String(""), attributes);
     event.setCommitString(QLatin1String(""), 0, 0);
     m_preeditString.clear();
     m_inlinePosition = 0;
     sendEvent(event);
-
-    // Sync with native side editor state. Native side can then do various operations
-    // based on editor state, such as removing 'exact word bubble'.
-    if (!m_pendingInputCapabilitiesChanged)
-        ReportAknEdStateEvent(MAknEdStateObserver::EAknSyncEdwinState);
-
-    m_pendingTransactionCancel = false;
 }
 
 TInt QCoeFepInputContext::DocumentLengthForFep() const
@@ -1098,18 +1087,7 @@ TInt QCoeFepInputContext::DocumentLengthForFep() const
         return 0;
 
     QVariant variant = w->inputMethodQuery(Qt::ImSurroundingText);
-
-    int size = variant.value<QString>().size() + m_preeditString.size();
-
-    // To fix an issue with backspaces not being generated if document size is zero,
-    // fake document length to be at least one always, except when dealing with
-    // hidden text widgets, where this faking would generate extra asterisk. Since the
-    // primary use of hidden text widgets is password fields, they are unlikely to
-    // support multiple lines anyway.
-    if (size == 0 && !(m_textCapabilities & TCoeInputCapabilities::ESecretText))
-        size = 1;
-
-    return size;
+    return variant.value<QString>().size() + m_preeditString.size();
 }
 
 TInt QCoeFepInputContext::DocumentMaximumLengthForFep() const
@@ -1192,12 +1170,6 @@ void QCoeFepInputContext::GetEditorContentForFep(TDes& aEditorContent, TInt aDoc
     // FEP expects the preedit string to be part of the editor content, so let's mix it in.
     int cursor = w->inputMethodQuery(Qt::ImCursorPosition).toInt();
     text.insert(cursor, m_preeditString);
-
-    // Add additional space to empty non-password text to compensate
-    // for the fake length we specified in DocumentLengthForFep().
-    if (text.size() == 0 && !(m_textCapabilities & TCoeInputCapabilities::ESecretText))
-        text += QChar(0x20);
-
     aEditorContent.Copy(qt_QString2TPtrC(text.mid(aDocumentPosition, aLengthToRetrieve)));
 }
 
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index a53d273..b98bdbc 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -2723,9 +2723,6 @@ QS60ThreadLocalData::QS60ThreadLocalData()
 
 QS60ThreadLocalData::~QS60ThreadLocalData()
 {
-    for (int i = 0; i < releaseFuncs.count(); ++i)
-        releaseFuncs[i]();
-    releaseFuncs.clear();
     if (!usingCONEinstances) {
         delete screenDevice;
         wsSession.Close();
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 8635bf2..f8e4e57 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -934,7 +934,7 @@ QKeySequence::QKeySequence(const QString &key)
 }
 
 /*!
-    \since 4.7
+    \since 4.x
     Creates a key sequence from the \a key string based on \a format.
 */
 QKeySequence::QKeySequence(const QString &key, QKeySequence::SequenceFormat format)
@@ -1131,7 +1131,7 @@ int QKeySequence::assign(const QString &ks)
 
 /*!
     \fn int QKeySequence::assign(const QString &keys, QKeySequence::SequenceFormat format)
-    \since 4.7
+    \since 4.x
 
     Adds the given \a keys to the key sequence (based on \a format).
     \a keys may contain up to four key codes, provided they are
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 80e6ec6..2700bbb 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -126,10 +126,8 @@ QAction *QSoftKeyManager::createAction(StandardSoftKey standardKey, QWidget *act
     default:
         break;
     };
-    if (key != 0) {
+    if (key != 0)
         QSoftKeyManager::instance()->d_func()->softKeyCommandActions.insert(action, key);
-        connect(action, SIGNAL(destroyed(QObject*)), QSoftKeyManager::instance(), SLOT(cleanupHash(QObject*)));
-    }
 #endif
     QAction::SoftKeyRole softKeyRole = QAction::NoSoftKey;
     switch (standardKey) {
@@ -162,13 +160,7 @@ QAction *QSoftKeyManager::createKeyedAction(StandardSoftKey standardKey, Qt::Key
     QScopedPointer<QAction> action(createAction(standardKey, actionWidget));
 
     connect(action.data(), SIGNAL(triggered()), QSoftKeyManager::instance(), SLOT(sendKeyEvent()));
-
-#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4) && !defined(SYMBIAN_VERSION_9_3) && !defined(SYMBIAN_VERSION_9_2)
-    // Don't connect destroyed slot if is was already connected in createAction
-    if (!(QSoftKeyManager::instance()->d_func()->softKeyCommandActions.contains(action.data())))
-#endif
     connect(action.data(), SIGNAL(destroyed(QObject*)), QSoftKeyManager::instance(), SLOT(cleanupHash(QObject*)));
-
     QSoftKeyManager::instance()->d_func()->keyedActions.insert(action.data(), key);
     return action.take();
 #endif //QT_NO_ACTION
@@ -177,9 +169,7 @@ QAction *QSoftKeyManager::createKeyedAction(StandardSoftKey standardKey, Qt::Key
 void QSoftKeyManager::cleanupHash(QObject *obj)
 {
     Q_D(QSoftKeyManager);
-    // Can't use qobject_cast in destroyed() signal handler as that'll return NULL,
-    // so use static_cast instead. Since the pointer is only used as a hash key, it is safe.
-    QAction *action = static_cast<QAction *>(obj);
+    QAction *action = qobject_cast<QAction*>(obj);
     d->keyedActions.remove(action);
 #if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4) && !defined(SYMBIAN_VERSION_9_3) && !defined(SYMBIAN_VERSION_9_2)
     d->softKeyCommandActions.remove(action);
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index 3e6a293..4295f60 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -97,10 +97,6 @@ static const int qt_symbian_max_screens = 4;
 //this macro exists because EColor16MAP enum value doesn't exist in Symbian OS 9.2
 #define Q_SYMBIAN_ECOLOR16MAP TDisplayMode(13)
 
-class QSymbianTypeFaceExtras;
-typedef QHash<QString, const QSymbianTypeFaceExtras *> QSymbianTypeFaceExtrasHash;
-typedef void (*QThreadLocalReleaseFunc)();
-
 class Q_AUTOTEST_EXPORT QS60ThreadLocalData
 {
 public:
@@ -109,8 +105,6 @@ public:
     bool usingCONEinstances;
     RWsSession wsSession;
     CWsScreenDevice *screenDevice;
-    QSymbianTypeFaceExtrasHash fontData;
-    QVector<QThreadLocalReleaseFunc> releaseFuncs;
 };
 
 class QS60Data
@@ -184,8 +178,6 @@ public:
     inline CWsScreenDevice* screenDevice(const QWidget *widget);
     inline CWsScreenDevice* screenDevice(int screenNumber);
     static inline int screenNumberForWidget(const QWidget *widget);
-    inline QSymbianTypeFaceExtrasHash& fontData();
-    inline void addThreadLocalReleaseFunc(QThreadLocalReleaseFunc func);
     static inline CCoeAppUi* appUi();
     static inline CEikMenuBar* menuBar();
 #ifdef Q_WS_S60
@@ -485,24 +477,6 @@ inline int QS60Data::screenNumberForWidget(const QWidget *widget)
     return qt_widget_private(const_cast<QWidget *>(w))->symbianScreenNumber;
 }
 
-inline QSymbianTypeFaceExtrasHash& QS60Data::fontData()
-{
-    if (!tls.hasLocalData()) {
-        tls.setLocalData(new QS60ThreadLocalData);
-    }
-    return tls.localData()->fontData;
-}
-
-inline void QS60Data::addThreadLocalReleaseFunc(QThreadLocalReleaseFunc func)
-{
-    if (!tls.hasLocalData()) {
-        tls.setLocalData(new QS60ThreadLocalData);
-    }
-    QS60ThreadLocalData *data = tls.localData();
-    if (!data->releaseFuncs.contains(func))
-        data->releaseFuncs.append(func);
-}
-
 inline CCoeAppUi* QS60Data::appUi()
 {
     return CCoeEnv::Static()-> AppUi();
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index c490572..5630706 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -235,22 +235,11 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
     QSize oldSize(q->size());
     QRect oldGeom(data.crect);
 
-    bool checkExtra = true;
-    if (q->isWindow() && (data.window_state & (Qt::WindowFullScreen | Qt::WindowMaximized))) {
-        // Do not allow fullscreen/maximized windows to expand beyond client rect
-        TRect r = S60->clientRect();
-        w = qMin(w, r.Width());
-        h = qMin(h, r.Height());
-
-        if (w == r.Width() && h == r.Height())
-            checkExtra = false;
-    }
-
     // Lose maximized status if deliberate resize
     if (w != oldSize.width() || h != oldSize.height())
         data.window_state &= ~Qt::WindowMaximized;
 
-    if (checkExtra && extra) {  // any size restrictions?
+    if (extra) {                                // any size restrictions?
         w = qMin(w,extra->maxw);
         h = qMin(h,extra->maxh);
         w = qMax(w,extra->minw);
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
index d209726..1c1bc29 100644
--- a/src/gui/text/qfontdatabase_s60.cpp
+++ b/src/gui/text/qfontdatabase_s60.cpp
@@ -166,6 +166,7 @@ public:
     COpenFontRasterizer *m_rasterizer;
     mutable QList<const QSymbianTypeFaceExtras *> m_extras;
 
+    mutable QHash<QString, const QSymbianTypeFaceExtras *> m_extrasHash;
     mutable QSet<QString> m_applicationFontFamilies;
 };
 
@@ -268,9 +269,8 @@ void QSymbianFontDatabaseExtrasImplementation::clear()
             static_cast<const QSymbianFontDatabaseExtrasImplementation*>(db->symbianExtras);
     if (!dbExtras)
         return; // initializeDb() has never been called
-    QSymbianTypeFaceExtrasHash &extrasHash = S60->fontData();
     if (QSymbianTypeFaceExtras::symbianFontTableApiAvailable()) {
-        qDeleteAll(extrasHash);
+        qDeleteAll(dbExtras->m_extrasHash);
     } else {
         typedef QList<const QSymbianTypeFaceExtras *>::iterator iterator;
         for (iterator p = dbExtras->m_extras.begin(); p != dbExtras->m_extras.end(); ++p) {
@@ -279,16 +279,11 @@ void QSymbianFontDatabaseExtrasImplementation::clear()
         }
         dbExtras->m_extras.clear();
     }
-    extrasHash.clear();
+    dbExtras->m_extrasHash.clear();
 }
 
 void qt_cleanup_symbianFontDatabase()
 {
-    static bool cleanupDone = false;
-    if (cleanupDone)
-        return;
-    cleanupDone = true;
-
     QFontDatabasePrivate *db = privateDb();
     if (!db)
         return;
@@ -339,12 +334,9 @@ COpenFont* OpenFontFromBitmapFont(const CBitmapFont* aBitmapFont)
 const QSymbianTypeFaceExtras *QSymbianFontDatabaseExtrasImplementation::extras(const QString &aTypeface,
                                                                                bool bold, bool italic) const
 {
-    QSymbianTypeFaceExtrasHash &extrasHash = S60->fontData();
-    if (extrasHash.isEmpty() && QThread::currentThread() != QApplication::instance()->thread())
-        S60->addThreadLocalReleaseFunc(clear);
     const QString typeface = qt_symbian_fontNameWithAppFontMarker(aTypeface);
     const QString searchKey = typeface + QString::number(int(bold)) + QString::number(int(italic));
-    if (!extrasHash.contains(searchKey)) {
+    if (!m_extrasHash.contains(searchKey)) {
         TFontSpec searchSpec(qt_QString2TPtrC(typeface), 1);
         if (bold)
             searchSpec.iFontStyle.SetStrokeWeight(EStrokeWeightBold);
@@ -358,7 +350,7 @@ const QSymbianTypeFaceExtras *QSymbianFontDatabaseExtrasImplementation::extras(c
             QScopedPointer<CFont, CFontFromScreenDeviceReleaser> sFont(font);
             QSymbianTypeFaceExtras *extras = new QSymbianTypeFaceExtras(font);
             sFont.take();
-            extrasHash.insert(searchKey, extras);
+            m_extrasHash.insert(searchKey, extras);
         } else {
             const TInt err = m_store->GetNearestFontToDesignHeightInPixels(font, searchSpec);
             Q_ASSERT(err == KErrNone && font);
@@ -372,20 +364,20 @@ const QSymbianTypeFaceExtras *QSymbianFontDatabaseExtrasImplementation::extras(c
             const TOpenFontFaceAttrib* const attrib = openFont->FaceAttrib();
             const QString foundKey =
                     QString((const QChar*)attrib->FullName().Ptr(), attrib->FullName().Length());
-            if (!extrasHash.contains(foundKey)) {
+            if (!m_extrasHash.contains(foundKey)) {
                 QScopedPointer<CFont, CFontFromFontStoreReleaser> sFont(font);
                 QSymbianTypeFaceExtras *extras = new QSymbianTypeFaceExtras(font, openFont);
                 sFont.take();
                 m_extras.append(extras);
-                extrasHash.insert(searchKey, extras);
-                extrasHash.insert(foundKey, extras);
+                m_extrasHash.insert(searchKey, extras);
+                m_extrasHash.insert(foundKey, extras);
             } else {
                 m_store->ReleaseFont(font);
-                extrasHash.insert(searchKey, extrasHash.value(foundKey));
+                m_extrasHash.insert(searchKey, m_extrasHash.value(foundKey));
             }
         }
     }
-    return extrasHash.value(searchKey);
+    return m_extrasHash.value(searchKey);
 }
 
 void QSymbianFontDatabaseExtrasImplementation::removeAppFontData(
@@ -979,7 +971,7 @@ bool QFontDatabase::removeAllApplicationFonts()
 
 bool QFontDatabase::supportsThreadedFontRendering()
 {
-    return QSymbianTypeFaceExtras::symbianFontTableApiAvailable();
+    return false;
 }
 
 static
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index 198bc04..a879b49 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -60,7 +60,7 @@
 QT_BEGIN_NAMESPACE
 
 #ifdef QT_GUI_PASSWORD_ECHO_DELAY
-static const int qt_passwordEchoDelay = QT_GUI_PASSWORD_ECHO_DELAY;
+static int qt_passwordEchoDelay = QT_GUI_PASSWORD_ECHO_DELAY;
 #endif
 
 /*!
@@ -93,8 +93,8 @@ void QLineControl::updateDisplayText(bool forceUpdate)
     if (m_echoMode == QLineEdit::Password) {
         str.fill(m_passwordCharacter);
 #ifdef QT_GUI_PASSWORD_ECHO_DELAY
-        if (m_passwordEchoTimer != 0 && m_cursor > 0 && m_cursor <= m_text.length()) {
-            int cursor = m_cursor - 1;
+        if (m_passwordEchoTimer != 0 && !str.isEmpty()) {
+            int cursor = m_text.length() - 1;
             QChar uc = m_text.at(cursor);
             str[cursor] = uc;
             if (cursor > 0 && uc.unicode() >= 0xdc00 && uc.unicode() < 0xe000) {
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index b6661c9..6757d77 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -2472,8 +2472,6 @@ bool QTextEdit::find(const QString &exp, QTextDocument::FindFlags options)
     and the text edit will try to guess the right format.
 
     Use setHtml() or setPlainText() directly to avoid text edit's guessing.
-
-    \sa toPlainText(), toHtml()
 */
 void QTextEdit::setText(const QString &text)
 {