Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys

4 files changed, 19 insertions, 23 deletions

diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index 7cd7b0c..befc7b6 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -516,12 +516,12 @@ in the \l{Qt for Windows CE Requirements} document.
                Install this to all S60 SDKs you plan to use Qt with.
         \endlist
 
-        Make sure you have the following packages installed on any device you want to use to run Qt applications. 
-        These packages can be found under \c nokia_plugin directory in any S60 SDK where you have installed Open C/C++:
+        Make sure you have the following plugins installed on your device. The packages can be found
+        in the S60 SDK where you installed Open C/C++:
         \list
-            \o pips_s60_<version>.sis 
-            \o openc_ssl_s60_<version>.sis
-            \o stdcpp_s60_<version>.sis
+            \o nokia_plugin\openc\s60opencsis\pips_s60_<version>.sis
+            \o nokia_plugin\openc\s60opencsis\openc_ssl_s60_<version>.sis
+            \o nokia_plugin\opencpp\s60opencppsis\stdcpp_s60_<version>.sis
         \endlist
         
         These instructions assume the above tools are installed and
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index 879c980..3ea50ff 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -140,7 +140,7 @@ CFbsBitmap *QPixmap::toSymbianCFbsBitmap() const
     case QImage::Format_ARGB32_Premultiplied:
 #if !defined(__SERIES60_31__) && !defined(__S60_32__)
         // ### TODO: Add runtime detection as well?
-        mode = EColor16MAP:
+        mode = EColor16MAP;
             break;
 #endif
         destFormat = QImage::Format_ARGB32;
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 6647558..69e1ee4 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -1841,8 +1841,9 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
         const QInputMethodEvent::Attribute &a = e->attributes().at(i);
         if (a.type == QInputMethodEvent::Selection) {
             QTextCursor oldCursor = cursor;
-            cursor.setPosition(a.start, QTextCursor::MoveAnchor);
-            cursor.setPosition(a.start + a.length, QTextCursor::KeepAnchor);
+            int blockStart = a.start + cursor.block().position();
+            cursor.setPosition(blockStart, QTextCursor::MoveAnchor);
+            cursor.setPosition(blockStart + a.length, QTextCursor::KeepAnchor);
             q->ensureCursorVisible();
             repaintOldAndNewSelection(oldCursor);
         }
diff --git a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
index b975405..624d193 100644
--- a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -2213,21 +2213,16 @@ void tst_QDateTimeEdit::mousePress()
     testWidget->setDate(QDate(2004, 6, 23));
     testWidget->setCurrentSection(QDateTimeEdit::YearSection);
     QCOMPARE(testWidget->currentSection(), QDateTimeEdit::YearSection);
-    int offset = 10;
-#if defined(Q_OS_WINCE)
-    offset = 20;
-    if (qt_wince_is_pocket_pc()) {
-        // depending on wether the display is double-pixeld, we need
-        // to click at a different position
-        bool doubledSize = false;
-        int dpi = GetDeviceCaps(GetDC(0), LOGPIXELSX);
-        if ((dpi < 1000) && (dpi > 0))
-            doubledSize = true;
-        offset = doubledSize ? 50 : 25; // On CE buttons are aligned horizontal
-    }
-#endif
-    QTest::mouseClick(testWidget, Qt::LeftButton, 0, QPoint(testWidget->width() - offset, 5));
-    QCOMPARE(testWidget->date().year(), 2005);
+
+    // Ask the SC_SpinBoxUp button location from style
+    QStyleOptionSpinBox so;
+    so.rect = testWidget->rect();    
+    QRect rectUp = testWidget->style()->subControlRect(QStyle::CC_SpinBox, &so, QStyle::SC_SpinBoxUp, testWidget);
+    
+    // Send mouseClick to center of SC_SpinBoxUp
+    QTest::mouseClick(testWidget, Qt::LeftButton, 0, rectUp.center());
+    QCOMPARE(testWidget->date().year(), 2005);    
+
 }
 
 void tst_QDateTimeEdit::stepHourAMPM_data()