Merge branch 4.7 into qt-4.8-from-4.7

9 files changed, 51 insertions, 16 deletions

diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 9f59c6e..ad9e113 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -156,12 +156,16 @@
            whole lifetime. This attribute must be set before QApplication is
            constructed.
 
-    \omitvalue AA_S60DisablePartialScreenInputMode By default in Symbian^3,
-           a separate editing window is opened on top of an application. This is exactly
-           like editing on previous versions of Symbian behave. When this attribute
-           is true, a virtual keyboard window is shown on top of application and it
-           is ensured that the focused text widget is visible. This is only supported in
-           Symbian^3. (internal)
+    \value AA_S60DisablePartialScreenInputMode By default in Symbian^3, a separate
+           editing window is opened on top of an application. This is exactly like
+           editing on previous versions of Symbian behave. When this attribute is false,
+           a non-fullscreen virtual keyboard window is shown on top of application and
+           it is ensured that the focused text input widget is visible.
+           The auto-translation of input widget is only supported for applications
+           based on QGraphicsView, but the non-fullscreen virtual keyboard will
+           work for any kind of application (i.e. QWidgets-based). By default this
+           attribute is true. This attribute must be set after QApplication is
+           constructed. This is only supported in Symbian^3 and later Symbian releases.
 
     \value AA_X11InitThreads Calls XInitThreads() as part of the QApplication
            construction in order to make Xlib calls thread-safe. This
diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/gui/inputmethod/qcoefepinputcontext_p.h
index 5d3d8d9..9857015 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_p.h
+++ b/src/gui/inputmethod/qcoefepinputcontext_p.h
@@ -108,6 +108,7 @@ private:
     bool needsInputPanel();
     void commitTemporaryPreeditString();
     bool isWidgetVisible(QWidget *widget, int offset = 0);
+    bool isPartialKeyboardSupported();
 
 private Q_SLOTS:
     void ensureInputCapabilitiesChanged();
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 5fe25b2..5ddd53f 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -83,6 +83,8 @@ Q_GUI_EXPORT void qt_s60_setPartialScreenInputMode(bool enable)
 {
     S60->partial_keyboard = enable;
 
+    QApplication::setAttribute(Qt::AA_S60DisablePartialScreenInputMode, !S60->partial_keyboard);
+
     QInputContext *ic = 0;
     if (QApplication::focusWidget()) {
         ic = QApplication::focusWidget()->inputContext();
@@ -116,7 +118,7 @@ QCoeFepInputContext::QCoeFepInputContext(QObject *parent)
     m_fepState->SetObjectProvider(this);
     int defaultFlags = EAknEditorFlagDefault;
     if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0) {
-        if (S60->partial_keyboard) {
+        if (isPartialKeyboardSupported()) {
             defaultFlags |= QT_EAknEditorFlagEnablePartialScreen;
         }
         defaultFlags |= QT_EAknEditorFlagSelectionVisible;
@@ -425,7 +427,8 @@ void QCoeFepInputContext::mouseHandler(int x, QMouseEvent *event)
         //If splitview is open and T9 word is tapped, pass the pointer event to pointer handler.
         //This will open the "suggested words" list. Pass pointer position always as zero, to make
         //full word replacement in case user makes a selection.
-        if (S60->partial_keyboard && S60->partialKeyboardOpen
+        if (isPartialKeyboardSupported()
+            && S60->partialKeyboardOpen
             && m_pointerHandler
             && !(currentHints & Qt::ImhNoPredictiveText)
             && (x > 0 && x < m_preeditString.length())) {
@@ -539,6 +542,11 @@ bool QCoeFepInputContext::isWidgetVisible(QWidget *widget, int offset)
     return visible;
 }
 
+bool QCoeFepInputContext::isPartialKeyboardSupported()
+{
+    return (S60->partial_keyboard || !QApplication::testAttribute(Qt::AA_S60DisablePartialScreenInputMode));
+}
+
 // Ensure that the input widget is visible in the splitview rect.
 
 void QCoeFepInputContext::ensureFocusWidgetVisible(QWidget *widget)
@@ -650,7 +658,7 @@ void QCoeFepInputContext::updateHints(bool mustUpdateInputCapabilities)
         // we need to update its state separately.
         if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0) {
             TInt currentFlags = m_fepState->Flags();
-            if (S60->partial_keyboard)
+            if (isPartialKeyboardSupported())
                 currentFlags |= QT_EAknEditorFlagEnablePartialScreen;
             else
                 currentFlags &= ~QT_EAknEditorFlagEnablePartialScreen;
@@ -767,7 +775,7 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints)
 
     flags = 0;
     if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0) {
-        if (S60->partial_keyboard)
+        if (isPartialKeyboardSupported())
             flags |= QT_EAknEditorFlagEnablePartialScreen;
         flags |= QT_EAknEditorFlagSelectionVisible;
     }
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 361ec6d..cd13894 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -1019,6 +1019,10 @@ void QApplicationPrivate::initialize()
     QApplicationPrivate::wheel_scroll_lines = 3;
 #endif
 
+#ifdef Q_WS_S60
+    q->setAttribute(Qt::AA_S60DisablePartialScreenInputMode);
+#endif
+
     if (qt_is_gui_used)
         initializeMultitouch();
 }
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 7c644ad..9b2a6e8 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -649,8 +649,11 @@ bool QHttpNetworkConnectionChannel::expand(bool dataComplete)
         int ret = Z_OK;
         if (content.size())
             ret = reply->d_func()->gunzipBodyPartially(content, inflated);
-        int retCheck = (dataComplete) ? Z_STREAM_END : Z_OK;
-        if (ret >= retCheck) {
+        if (ret >= Z_OK) {
+            if (dataComplete && ret == Z_OK && !reply->d_func()->streamEnd) {
+                reply->d_func()->gunzipBodyPartiallyEnd();
+                reply->d_func()->streamEnd = true;
+            }
             if (inflated.size()) {
                 reply->d_func()->totalProgress += inflated.size();
                 reply->d_func()->appendUncompressedReplyData(inflated);
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index 00653b6..1a02200 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -461,15 +461,21 @@ int QHttpNetworkReplyPrivate::gunzipBodyPartially(QByteArray &compressed, QByteA
         }
         have = sizeof(out) - inflateStrm.avail_out;
         inflated.append(QByteArray((const char *)out, have));
-     } while (inflateStrm.avail_out == 0);
+     } while (inflateStrm.avail_out == 0 && inflateStrm.avail_in > 0);
     // clean up and return
     if (ret <= Z_ERRNO || ret == Z_STREAM_END) {
-        inflateEnd(&inflateStrm);
-        initInflate = false;
+        gunzipBodyPartiallyEnd();
     }
     streamEnd = (ret == Z_STREAM_END);
     return ret;
 }
+
+void QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd()
+{
+    inflateEnd(&inflateStrm);
+    initInflate = false;
+}
+
 #endif
 
 qint64 QHttpNetworkReplyPrivate::readStatus(QAbstractSocket *socket)
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 583a256..de6c0d2 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -207,6 +207,7 @@ public:
 #ifndef QT_NO_COMPRESS
     bool gzipCheckHeader(QByteArray &content, int &pos);
     int gunzipBodyPartially(QByteArray &compressed, QByteArray &inflated);
+    void gunzipBodyPartiallyEnd();
 #endif
     void removeAutoDecompressHeader();
 
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 8e301a1..58eb0d8 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -1030,7 +1030,7 @@ bool QNetworkReplyImplPrivate::migrateBackend()
         return true;
 
     // Backend does not support resuming download.
-    if (!backend->canResume())
+    if (backend && !backend->canResume())
         return false;
 
     state = QNetworkReplyImplPrivate::Reconnecting;
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
index 3423d2c..94efc2f 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
@@ -174,6 +174,14 @@ bool QMeeGoGraphicsSystemSwitchHandler::eventFilter(QObject *object, QEvent *eve
                     QMeeGoGraphicsSystem::switchToMeeGo();
             }
         }
+    } else if (event->type() == QEvent::Show
+               && QMeeGoGraphicsSystem::switchPolicy == QMeeGoGraphicsSystem::AutomaticSwitch) {
+        if (visibleWidgets() > 0)
+            QMeeGoGraphicsSystem::switchToMeeGo();
+    } else if (event->type() == QEvent::Hide
+               && QMeeGoGraphicsSystem::switchPolicy == QMeeGoGraphicsSystem::AutomaticSwitch) {
+        if (visibleWidgets() == 0)
+            QMeeGoGraphicsSystem::switchToRaster();
     }
 
     // resume processing of event