Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Doc: Fix example code
  Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
  Accepting predicted text using hardware keyboard replaces unwanted part
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
  Workaround to VideoCore III scissor bug.
  Fix to QGLWidget crash
  Update def files
  Fix crash on exit when overriding signal handlers in states.
  Typo fix
  Add new signals to indicate GPU resource usage.
  symbian - search drives for translation files
  symbian - search drives for translation files
  Cannot flick to the end of a horizontal list view width LayoutMirroring
  Backport more imports directory caching changes.
  Symbian - fix deleteLater not working from RunL
  Fix more test DEPLOYMENT statements for Symbian
  Fix deployment for declarative tests, examples on Symbian
  Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
  Backport imports directory caching performance optimization

6 files changed, 94 insertions, 3 deletions

diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/gui/inputmethod/qcoefepinputcontext_p.h
index ad51b4b..90d47f9 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_p.h
+++ b/src/gui/inputmethod/qcoefepinputcontext_p.h
@@ -205,6 +205,7 @@ private:
     QBasicTimer m_tempPreeditStringTimeout;
     bool m_hasTempPreeditString;
     QString m_cachedPreeditString;
+    int m_cachedCursorAndAnchorPosition;
 
     int m_splitViewResizeBy;
     Qt::WindowStates m_splitViewPreviousWindowStates;
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 8f13c53..ed7411f 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -380,6 +380,7 @@ QCoeFepInputContext::QCoeFepInputContext(QObject *parent)
       m_formatRetriever(0),
       m_pointerHandler(0),
       m_hasTempPreeditString(false),
+      m_cachedCursorAndAnchorPosition(-1),
       m_splitViewResizeBy(0),
       m_splitViewPreviousWindowStates(Qt::WindowNoState),
       m_splitViewPreviousFocusItem(0),
@@ -448,9 +449,18 @@ void QCoeFepInputContext::reset()
     }
     // Store a copy of preedit text, if prediction is active and input context is reseted.
     // This is to ensure that we can replace preedit string after losing focus to FEP manager's
-    // internal sub-windows.
-    if (m_cachedPreeditString.isEmpty() && !(currentHints & Qt::ImhNoPredictiveText))
+    // internal sub-windows. Additionally, store the cursor position if there is no selected text.
+    // This allows input context to replace preedit strings if they are not at the end of current
+    // text.
+    if (m_cachedPreeditString.isEmpty() && !(currentHints & Qt::ImhNoPredictiveText)) {
         m_cachedPreeditString = m_preeditString;
+        if (focusWidget() && !m_cachedPreeditString.isEmpty()) {
+            int cursor = focusWidget()->inputMethodQuery(Qt::ImCursorPosition).toInt();
+            int anchor = focusWidget()->inputMethodQuery(Qt::ImAnchorPosition).toInt();
+            if (cursor == anchor)
+                m_cachedCursorAndAnchorPosition = cursor;
+        }
+    }
     commitCurrentString(true);
 
     // QGraphicsScene calls reset() when changing focus item. Unfortunately, the new focus item is
@@ -491,6 +501,7 @@ void QCoeFepInputContext::setFocusWidget(QWidget *w)
 void QCoeFepInputContext::widgetDestroyed(QWidget *w)
 {
     m_cachedPreeditString.clear();
+    m_cachedCursorAndAnchorPosition = -1;
 
     // Make sure that the input capabilities of whatever new widget got focused are queried.
     CCoeControl *ctrl = w->effectiveWinId();
@@ -1350,6 +1361,7 @@ void QCoeFepInputContext::StartFepInlineEditL(const TDesC& aInitialInlineText,
         return;
 
     m_cachedPreeditString.clear();
+    m_cachedCursorAndAnchorPosition = -1;
 
     commitTemporaryPreeditString();
 
@@ -1408,8 +1420,16 @@ void QCoeFepInputContext::UpdateFepInlineTextL(const TDesC& aNewInlineText,
     QString newPreeditString = qt_TDesC2QString(aNewInlineText);
     QInputMethodEvent event(newPreeditString, attributes);
     if (!m_cachedPreeditString.isEmpty()) {
-        event.setCommitString(QLatin1String(""), -m_cachedPreeditString.length(), m_cachedPreeditString.length());
+        int cursorPos = w->inputMethodQuery(Qt::ImCursorPosition).toInt();
+        // Predicted word is either replaced from the end of the word (normal case),
+        // or from stored location, if the predicted word is either in the beginning of,
+        // or in the middle of already committed word.
+        int diff = cursorPos - m_cachedCursorAndAnchorPosition;
+        int replaceLocation = (diff != m_cachedPreeditString.length()) ? diff : m_cachedPreeditString.length();
+
+        event.setCommitString(QLatin1String(""), -replaceLocation, m_cachedPreeditString.length());
         m_cachedPreeditString.clear();
+        m_cachedCursorAndAnchorPosition = -1;
     } else if (newPreeditString.isEmpty() && m_preeditString.isEmpty()) {
         // In Symbian world this means "erase last character".
         event.setCommitString(QLatin1String(""), -1, 1);
@@ -1507,6 +1527,10 @@ void QCoeFepInputContext::SetCursorSelectionForFepL(const TCursorSelection& aCur
 
     int pos = aCursorSelection.iAnchorPos;
     int length = aCursorSelection.iCursorPos - pos;
+    if (m_cachedCursorAndAnchorPosition != -1) {
+        pos = m_cachedCursorAndAnchorPosition;
+        length = 0;
+    }
 
     QList<QInputMethodEvent::Attribute> attributes;
     attributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, pos, length, QVariant());
@@ -1524,6 +1548,13 @@ void QCoeFepInputContext::GetCursorSelectionForFep(TCursorSelection& aCursorSele
 
     int cursor = w->inputMethodQuery(Qt::ImCursorPosition).toInt() + m_preeditString.size();
     int anchor = w->inputMethodQuery(Qt::ImAnchorPosition).toInt() + m_preeditString.size();
+
+    // If the position is stored, use that value, so that word replacement from proposed word
+    // lists are added to the correct position.
+    if (m_cachedCursorAndAnchorPosition != -1) {
+        cursor = m_cachedCursorAndAnchorPosition;
+        anchor = m_cachedCursorAndAnchorPosition;
+    }
     QString text = w->inputMethodQuery(Qt::ImSurroundingText).value<QString>();
     int combinedSize = text.size() + m_preeditString.size();
     if (combinedSize < anchor || combinedSize < cursor) {
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 35a9559..3605472 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -3426,7 +3426,35 @@ QString QApplication::sessionKey() const
 }
 #endif
 
+/*!
+    \since 4.7.4
+    \fn void QApplication::aboutToReleaseGpuResources()
+
+    This signal is emitted when application is about to release all
+    GPU resources associated to contexts owned by application.
+
+    The signal is particularly useful if your application has allocated
+    GPU resources directly apart from Qt and needs to do some last-second
+    cleanup.
+
+    \warning This signal is only emitted on Symbian.
+
+    \sa aboutToUseGpuResources()
+*/
 
+/*!
+    \since 4.7.4
+    \fn void QApplication::aboutToUseGpuResources()
+
+    This signal is emitted when application is about to use GPU resources.
+
+    The signal is particularly useful if your application needs to know
+    when GPU resources are be available.
+
+   \warning This signal is only emitted on Symbian.
+
+   \sa aboutToFreeGpuResources()
+*/
 
 /*!
     \since 4.2
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 1548849..3334056 100644
--- a/src/gui/kernel/qapplication.h
+++ b/src/gui/kernel/qapplication.h
@@ -305,6 +305,10 @@ Q_SIGNALS:
     void commitDataRequest(QSessionManager &sessionManager);
     void saveStateRequest(QSessionManager &sessionManager);
 #endif
+#ifdef Q_OS_SYMBIAN
+    void aboutToReleaseGpuResources();
+    void aboutToUseGpuResources();
+#endif
 
 public:
     QString styleSheet() const;
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 0756d6c..c4cb19c 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -564,6 +564,9 @@ public:
     void symbianHandleLiteModeStartup();
 
     void _q_aboutToQuit();
+
+    void emitAboutToReleaseGpuResources();
+    void emitAboutToUseGpuResources();
 #endif
 #if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) || defined(Q_WS_MAC) || defined(Q_WS_QPA)
     void sendSyntheticEnterLeave(QWidget *widget);
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 7d198ce..954d7fb 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -235,6 +235,9 @@ void QS60Data::controlVisibilityChanged(CCoeControl *control, bool visible)
         if (QTLWExtra *topData = qt_widget_private(window)->maybeTopData()) {
             QWidgetBackingStoreTracker &backingStore = topData->backingStore;
             if (visible) {
+                QApplicationPrivate *d = QApplicationPrivate::instance();
+                d->emitAboutToUseGpuResources();
+
                 if (backingStore.data()) {
                     backingStore.registerWidget(widget);
                 } else {
@@ -244,6 +247,9 @@ void QS60Data::controlVisibilityChanged(CCoeControl *control, bool visible)
                     widget->repaint();
                 }
             } else {
+                QApplicationPrivate *d = QApplicationPrivate::instance();
+                d->emitAboutToReleaseGpuResources();
+
                 // In certain special scenarios we may get an ENotVisible event
                 // without a previous EPartiallyVisible. The backingstore must
                 // still be destroyed, hence the registerWidget() call below.
@@ -2795,6 +2801,24 @@ void QApplicationPrivate::_q_aboutToQuit()
 #endif
 }
 
+void QApplicationPrivate::emitAboutToReleaseGpuResources()
+{
+#ifdef Q_SYMBIAN_SUPPORTS_SURFACES
+    Q_Q(QApplication);
+    QPointer<QApplication> guard(q);
+    emit q->aboutToReleaseGpuResources();
+#endif
+}
+
+void QApplicationPrivate::emitAboutToUseGpuResources()
+{
+#ifdef Q_SYMBIAN_SUPPORTS_SURFACES
+    Q_Q(QApplication);
+    QPointer<QApplication> guard(q);
+    emit q->aboutToUseGpuResources();
+#endif
+}
+
 QS60ThreadLocalData::QS60ThreadLocalData()
 {
     CCoeEnv *env = CCoeEnv::Static();