From 725716bcf158988ac664da8f8bcd2d9a8e91a916 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Fri, 10 Dec 2010 10:32:11 +0100
Subject: Fixed several compile and deployment issues in the mmf phonon plugin.

RevBy:    Trust me
---
 src/3rdparty/phonon/mmf/abstractaudioeffect.h   | 2 +-
 src/3rdparty/phonon/mmf/audioequalizer.cpp      | 2 +-
 src/3rdparty/phonon/mmf/bassboost.cpp           | 2 +-
 src/3rdparty/phonon/mmf/environmentalreverb.cpp | 2 +-
 src/3rdparty/phonon/mmf/loudness.cpp            | 2 +-
 src/3rdparty/phonon/mmf/stereowidening.cpp      | 2 +-
 src/plugins/phonon/mmf/mmf.pro                  | 4 ++--
 src/s60installs/s60installs.pro                 | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/3rdparty/phonon/mmf/abstractaudioeffect.h b/src/3rdparty/phonon/mmf/abstractaudioeffect.h
index 8879636..70adcf6 100644
--- a/src/3rdparty/phonon/mmf/abstractaudioeffect.h
+++ b/src/3rdparty/phonon/mmf/abstractaudioeffect.h
@@ -21,7 +21,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QScopedPointer>
 
-#include <audioeffectbase.h>
+#include <AudioEffectBase.h>
 
 #include <phonon/effectinterface.h>
 
diff --git a/src/3rdparty/phonon/mmf/audioequalizer.cpp b/src/3rdparty/phonon/mmf/audioequalizer.cpp
index 28433f6..1d2bbd4 100644
--- a/src/3rdparty/phonon/mmf/audioequalizer.cpp
+++ b/src/3rdparty/phonon/mmf/audioequalizer.cpp
@@ -16,7 +16,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <audioequalizerbase.h>
+#include <AudioEqualizerBase.h>
 #include "audioequalizer.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/3rdparty/phonon/mmf/bassboost.cpp b/src/3rdparty/phonon/mmf/bassboost.cpp
index 81d9208..67076f6 100644
--- a/src/3rdparty/phonon/mmf/bassboost.cpp
+++ b/src/3rdparty/phonon/mmf/bassboost.cpp
@@ -16,7 +16,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <bassboostbase.h>
+#include <BassBoostBase.h>
 #include "bassboost.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/3rdparty/phonon/mmf/environmentalreverb.cpp b/src/3rdparty/phonon/mmf/environmentalreverb.cpp
index c500385..d4f5223 100644
--- a/src/3rdparty/phonon/mmf/environmentalreverb.cpp
+++ b/src/3rdparty/phonon/mmf/environmentalreverb.cpp
@@ -16,7 +16,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <environmentalreverbbase.h>
+#include <EnvironmentalReverbBase.h>
 #include "environmentalreverb.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/3rdparty/phonon/mmf/loudness.cpp b/src/3rdparty/phonon/mmf/loudness.cpp
index 22d7518..ca05ab0 100644
--- a/src/3rdparty/phonon/mmf/loudness.cpp
+++ b/src/3rdparty/phonon/mmf/loudness.cpp
@@ -16,7 +16,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <loudnessbase.h>
+#include <LoudnessBase.h>
 #include "loudness.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/3rdparty/phonon/mmf/stereowidening.cpp b/src/3rdparty/phonon/mmf/stereowidening.cpp
index e452160..f90651b 100644
--- a/src/3rdparty/phonon/mmf/stereowidening.cpp
+++ b/src/3rdparty/phonon/mmf/stereowidening.cpp
@@ -16,7 +16,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <stereowideningbase.h>
+#include <StereoWideningBase.h>
 #include "stereowidening.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index 691fc80..5d7b61d 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -103,7 +103,7 @@ symbian {
 		exists($${EPOCROOT}epoc32/include/mw/downloadmgrclient.h) {
 			HEADERS += $$PHONON_MMF_DIR/download.h
 			SOURCES += $$PHONON_MMF_DIR/download.cpp
-			LIBS += -ldownloadmgr
+			LIBS += -lDownloadMgr
 			DEFINES += PHONON_MMF_PROGRESSIVE_DOWNLOAD
 		}
 	}
@@ -125,7 +125,7 @@ symbian {
 	LIBS += -lmediaclientaudiostream  # For CMdaAudioOutputStream
 
 	# These are for effects.
-	LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerBase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect
+	LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerbase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect
 
 	# This is needed for having the .qtplugin file properly created on Symbian.
 	QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index ff67bcf..5a435cd 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -132,7 +132,7 @@ symbian: {
     codecs_plugins.path = c:$$QT_PLUGINS_BASE_DIR/codecs
 
     contains(QT_CONFIG, phonon-backend) {
-        phonon_backend_plugins.sources += $$QMAKE_LIBDIR_QT/phonon_mmf$${QT_LIBINFIX}.dll
+        phonon_backend_plugins.sources += $$QT_BUILD_TREE/plugins/phonon_backend/phonon_mmf$${QT_LIBINFIX}.dll
 
         phonon_backend_plugins.path = c:$$QT_PLUGINS_BASE_DIR/phonon_backend
         DEPLOYMENT += phonon_backend_plugins
-- 
cgit v0.12


From 6aa1ab84404c92f2048270b1932fa10cecdcc58d Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Fri, 10 Dec 2010 15:35:06 +0100
Subject: Fixed a bug in the input methods on S60 with QGraphicsWebView.

The bug happened because we did not expect to receive a call to
CancelFepInlineEdit() when the widget had not previously been given
any preedit text by S60. However, this can happen, and if it happens
at the same time that there is a temporarily visible character in the
widget (because it will be obscured as a password a second later),
then the temporary character would be discarded.

Fixed by checking in the beginning of CancelFepInlineEdit() whether
we currently have any temporary preedit text or not, and if we do, we
don't clear the contents, since it is the input context itself that
generated the preedit text, not S60.

Also made sure that the temporary preedit text is committed if we
receive a call to UpdateFepInlineTextL(), which may sometimes happen
without a call to StartFepInlineEditL().

Task:     QT-4314
AutoTest: Included
RevBy:    Shane Kearns
---
 src/gui/inputmethod/qcoefepinputcontext_s60.cpp |   8 ++
 tests/auto/qinputcontext/qinputcontext.pro      |   2 +
 tests/auto/qinputcontext/tst_qinputcontext.cpp  | 141 +++++++++++++++++++++++-
 3 files changed, 148 insertions(+), 3 deletions(-)

diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 4a1b9b9..686f388 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -657,6 +657,8 @@ void QCoeFepInputContext::UpdateFepInlineTextL(const TDesC& aNewInlineText,
     if (!w)
         return;
 
+    commitTemporaryPreeditString();
+
     m_inlinePosition = aPositionOfInsertionPointInInlineText;
 
     QList<QInputMethodEvent::Attribute> attributes;
@@ -694,6 +696,12 @@ void QCoeFepInputContext::SetInlineEditingCursorVisibilityL(TBool aCursorVisibil
 
 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)
+        return;
+
     QList<QInputMethodEvent::Attribute> attributes;
     QInputMethodEvent event(QLatin1String(""), attributes);
     event.setCommitString(QLatin1String(""), 0, 0);
diff --git a/tests/auto/qinputcontext/qinputcontext.pro b/tests/auto/qinputcontext/qinputcontext.pro
index ec6831e..4b3ab96 100644
--- a/tests/auto/qinputcontext/qinputcontext.pro
+++ b/tests/auto/qinputcontext/qinputcontext.pro
@@ -1,6 +1,8 @@
 load(qttest_p4)
 SOURCES  += tst_qinputcontext.cpp
 
+contains(QT_CONFIG, webkit):QT += webkit
+
 symbian {
     LIBS += -lws32 -lcone
 }
diff --git a/tests/auto/qinputcontext/tst_qinputcontext.cpp b/tests/auto/qinputcontext/tst_qinputcontext.cpp
index 5a258a9..020f177 100644
--- a/tests/auto/qinputcontext/tst_qinputcontext.cpp
+++ b/tests/auto/qinputcontext/tst_qinputcontext.cpp
@@ -50,6 +50,13 @@
 #include <qwindowsstyle.h>
 #include <qdesktopwidget.h>
 #include <qpushbutton.h>
+#include <qgraphicsview.h>
+#include <qgraphicsscene.h>
+
+#ifdef QT_WEBKIT_LIB
+#include <qwebview.h>
+#include <qgraphicswebview.h>
+#endif
 
 #ifdef Q_OS_SYMBIAN
 #include <private/qt_s60_p.h>
@@ -466,6 +473,115 @@ void tst_QInputContext::focusProxy()
     QCOMPARE(gic->focusWidget(), &proxy);
 }
 
+#ifdef QT_WEBKIT_LIB
+class AutoWebView : public QWebView
+{
+    Q_OBJECT
+
+public:
+    AutoWebView()
+        : m_length(0)
+        , m_mode(QLineEdit::Normal)
+    {
+        updatePage();
+    }
+    ~AutoWebView() {}
+
+    void updatePage()
+    {
+        // The update might reset the input method parameters.
+        bool imEnabled = testAttribute(Qt::WA_InputMethodEnabled);
+        Qt::InputMethodHints hints = inputMethodHints();
+
+        QString page = "<html><body onLoad=\"document.forms.testform.testinput.focus()\">"
+                "<form name=\"testform\"><input name=\"testinput\" type=\"%1\" %2></form></body></html>";
+        if (m_mode == QLineEdit::Password)
+            page = page.arg("password");
+        else
+            page = page.arg("text");
+
+        if (m_length == 0)
+            page = page.arg("");
+        else
+            page = page.arg("maxlength=\"" + QString::number(m_length) + "\"");
+
+        setHtml(page);
+
+        setAttribute(Qt::WA_InputMethodEnabled, imEnabled);
+        setInputMethodHints(hints);
+    }
+    void setMaxLength(int length)
+    {
+        m_length = length;
+        updatePage();
+    }
+    void setEchoMode(QLineEdit::EchoMode mode)
+    {
+        m_mode = mode;
+        updatePage();
+    }
+
+    int m_length;
+    QLineEdit::EchoMode m_mode;
+};
+
+class AutoGraphicsWebView : public QGraphicsView
+{
+    Q_OBJECT
+
+public:
+    AutoGraphicsWebView()
+        : m_length(0)
+        , m_mode(QLineEdit::Normal)
+    {
+        m_scene.addItem(&m_view);
+        setScene(&m_scene);
+        m_view.setFocus();
+        updatePage();
+    }
+    ~AutoGraphicsWebView() {}
+
+    void updatePage()
+    {
+        // The update might reset the input method parameters.
+        bool imEnabled = testAttribute(Qt::WA_InputMethodEnabled);
+        Qt::InputMethodHints hints = inputMethodHints();
+
+        QString page = "<html><body onLoad=\"document.forms.testform.testinput.focus()\">"
+                "<form name=\"testform\"><input name=\"testinput\" type=\"%1\" %2></form></body></html>";
+        if (m_mode == QLineEdit::Password)
+            page = page.arg("password");
+        else
+            page = page.arg("text");
+
+        if (m_length == 0)
+            page = page.arg("");
+        else
+            page = page.arg("maxlength=\"" + QString::number(m_length) + "\"");
+
+        m_view.setHtml(page);
+
+        setAttribute(Qt::WA_InputMethodEnabled, imEnabled);
+        setInputMethodHints(hints);
+    }
+    void setMaxLength(int length)
+    {
+        m_length = length;
+        updatePage();
+    }
+    void setEchoMode(QLineEdit::EchoMode mode)
+    {
+        m_mode = mode;
+        updatePage();
+    }
+
+    int m_length;
+    QLineEdit::EchoMode m_mode;
+    QGraphicsScene m_scene;
+    QGraphicsWebView m_view;
+};
+#endif // QT_WEBKIT_LIB
+
 void tst_QInputContext::symbianTestCoeFepInputContext_data()
 {
 #ifdef Q_OS_SYMBIAN
@@ -481,6 +597,10 @@ void tst_QInputContext::symbianTestCoeFepInputContext_data()
     symbianTestCoeFepInputContext_addData<QLineEdit>();
     symbianTestCoeFepInputContext_addData<QPlainTextEdit>();
     symbianTestCoeFepInputContext_addData<QTextEdit>();
+# ifdef QT_WEBKIT_LIB
+    symbianTestCoeFepInputContext_addData<AutoWebView>();
+    symbianTestCoeFepInputContext_addData<AutoGraphicsWebView>();
+# endif
 #endif
 }
 
@@ -1087,13 +1207,28 @@ void tst_QInputContext::symbianTestCoeFepInputContext()
 
     editwidget->setAttribute(Qt::WA_InputMethodEnabled, inputMethodEnabled);
     editwidget->setInputMethodHints(inputMethodHints);
-    QLineEdit *lineedit = qobject_cast<QLineEdit *>(editwidget);
-    if (lineedit) {
+    if (QLineEdit *lineedit = qobject_cast<QLineEdit *>(editwidget)) {
         if (maxLength > 0)
             lineedit->setMaxLength(maxLength);
         lineedit->setEchoMode(echoMode);
+#ifdef QT_WEBKIT_LIB
+    } else if (AutoWebView *webView = qobject_cast<AutoWebView *>(editwidget)) {
+        if (maxLength > 0)
+            webView->setMaxLength(maxLength);
+        webView->setEchoMode(echoMode);
+        // WebKit disables T9 everywhere.
+        if (inputMethodEnabled && !(inputMethodHints & Qt::ImhNoPredictiveText))
+            return;
+    } else if (AutoGraphicsWebView *webView = qobject_cast<AutoGraphicsWebView *>(editwidget)) {
+        if (maxLength > 0)
+            webView->setMaxLength(maxLength);
+        webView->setEchoMode(echoMode);
+        // WebKit disables T9 everywhere.
+        if (inputMethodEnabled && !(inputMethodHints & Qt::ImhNoPredictiveText))
+            return;
+#endif
     } else if (maxLength > 0 || echoMode != QLineEdit::Normal) {
-        // Only QLineEdits support these features so don't attempt any tests using those
+        // Only some widgets support these features so don't attempt any tests using those
         // on other widgets.
         return;
     }
-- 
cgit v0.12