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

20 files changed, 37 insertions, 22 deletions

diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
index b543fa2..1a9d397 100644
--- a/demos/embedded/fluidlauncher/config_s60/config.xml
+++ b/demos/embedded/fluidlauncher/config_s60/config.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <demolauncher>
   <demos>
-    <example filename="embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer.png" args="/data/images/qt/demos/embeddedsvgviewer/shapes.svg"/>
-    <example filename="styledemo" name="Stylesheets" image="screenshots/styledemo.png"/>
+    <example filename="embeddedsvgviewer_s60" name="SVG Viewer" image="screenshots/embeddedsvgviewer_s60.png" args="/data/images/qt/demos/embeddedsvgviewer/shapes.svg"/>
+    <example filename="styledemo_s60" name="Stylesheets" image="screenshots/styledemo_s60.png"/>
     <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/>
     <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/>
-    <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly.png" args="-small-screen"/>
-    <example filename="ftp" name="Ftp Client" image="screenshots/ftp.png"/>
-    <example filename="context2d" name="Context2d" image="screenshots/context2d.png"/>
-    <example filename="saxbookmarks" name="SaxBookmarks" image="screenshots/saxbookmarks.png"/>
-    <example filename="desktopservices" name="Desktop Services" image="screenshots/desktopservices.png"/>
-    <example filename="fridgemagnets" name="Fridge Magnets" image="screenshots/fridgemagnets.png" args="-small-screen"/>
-    <example filename="drilldown" name="Drilldown" image="screenshots/drilldown.png"/>
+    <example filename="wiggly_s60" name="Wiggly Text" image="screenshots/wiggly_s60.png" args="-small-screen"/>
+    <example filename="ftp_s60" name="Ftp Client" image="screenshots/ftp_s60.png"/>
+    <example filename="context2d_s60" name="Context2d" image="screenshots/context2d_s60.png"/>
+    <example filename="saxbookmarks_s60" name="SaxBookmarks" image="screenshots/saxbookmarks_s60.png"/>
+    <example filename="desktopservices_s60" name="Desktop Services" image="screenshots/desktopservices_s60.png"/>
+    <example filename="fridgemagnets_s60" name="Fridge Magnets" image="screenshots/fridgemagnets_s60.png" args="-small-screen"/>
+    <example filename="drilldown_s60" name="Drilldown" image="screenshots/drilldown_s60.png"/>
     <example filename="softkeys" name="Softkeys" image="screenshots/softkeys.png"/>
   </demos>
   <slideshow timeout="60000" interval="10000">
diff --git a/demos/embedded/fluidlauncher/screenshots/context2d.png b/demos/embedded/fluidlauncher/screenshots/context2d.png
deleted file mode 100644
index d571546..0000000
--- a/demos/embedded/fluidlauncher/screenshots/context2d.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/context2d_s60.png b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png
new file mode 100644
index 0000000..a53f5b0
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/desktopservices.png b/demos/embedded/fluidlauncher/screenshots/desktopservices.png
deleted file mode 100644
index a8d82ce..0000000
--- a/demos/embedded/fluidlauncher/screenshots/desktopservices.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png
new file mode 100644
index 0000000..f4aa1a2
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/drilldown.png b/demos/embedded/fluidlauncher/screenshots/drilldown.png
deleted file mode 100644
index 413d713..0000000
--- a/demos/embedded/fluidlauncher/screenshots/drilldown.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png
new file mode 100644
index 0000000..50376c1
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
new file mode 100644
index 0000000..11459dc
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png b/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png
deleted file mode 100644
index 87b9099..0000000
--- a/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
new file mode 100644
index 0000000..56da9dc
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/ftp.png b/demos/embedded/fluidlauncher/screenshots/ftp.png
deleted file mode 100644
index fae7ffc..0000000
--- a/demos/embedded/fluidlauncher/screenshots/ftp.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/ftp_s60.png b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png
new file mode 100644
index 0000000..ea6a321
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png b/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png
deleted file mode 100644
index 6a2b07f..0000000
--- a/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png
+++ /dev/null
diff --git a/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
new file mode 100644
index 0000000..c451198
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png
new file mode 100644
index 0000000..bad9692
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png
new file mode 100644
index 0000000..690ab48
--- /dev/null
+++ b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png
diff --git a/examples/widgets/softkeys/softkeys.cpp b/examples/widgets/softkeys/softkeys.cpp
index 9672aee..e717510 100644
--- a/examples/widgets/softkeys/softkeys.cpp
+++ b/examples/widgets/softkeys/softkeys.cpp
@@ -127,7 +127,9 @@ void MainWindow::addSoftKeys()
     QList<QAction*> softkeys;
     softkeys.append(ok);
     softkeys.append(cancel);
-    pushButton->setSoftKeys(softkeys);
+    QWidget* focusWidget = QApplication::focusWidget();
+    if (focusWidget)
+        focusWidget->setSoftKeys(softkeys);
 }
 
 void MainWindow::exitApplication()
@@ -138,13 +140,17 @@ void MainWindow::exitApplication()
 void MainWindow::okPressed()
 {
     infoLabel->setText(tr("OK pressed"));
-    pushButton->setSoftKey(0);
+    QWidget* focusWidget = QApplication::focusWidget();
+    if (focusWidget)
+        focusWidget->setSoftKey(0);
 }
 
 void MainWindow::cancelPressed()
 {
     infoLabel->setText(tr("Cancel pressed"));
-    pushButton->setSoftKey(0);
+    QWidget* focusWidget = QApplication::focusWidget();
+    if (focusWidget)
+        focusWidget->setSoftKey(0);
 }
 
 
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 8528173..a16305e 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -1041,6 +1041,18 @@ QPicture& QPicture::operator=(const QPicture &p)
 /*!
   \internal
 
+  Constructs a QPicturePrivate
+*/
+QPicturePrivate::QPicturePrivate()
+    : in_memory_only(false),
+      q_ptr(0)
+{
+    ref = 1;
+}
+
+/*!
+  \internal
+
   Sets formatOk to false and resets the format version numbers to default
 */
 
diff --git a/src/gui/image/qpicture_p.h b/src/gui/image/qpicture_p.h
index e0c3117..373ff15 100644
--- a/src/gui/image/qpicture_p.h
+++ b/src/gui/image/qpicture_p.h
@@ -143,7 +143,7 @@ public:
         PdcReservedStop = 199 //   for Qt
     };
 
-    inline QPicturePrivate() : in_memory_only(false), q_ptr(0) { ref = 1; }
+    QPicturePrivate();
     QAtomicInt ref;
 
     bool checkFormat();
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index c6118d6..d2bd679 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -559,7 +559,7 @@ void QS60StylePrivate::drawRow(QS60StyleEnums::SkinParts start,
     QRect endRect;
 
     if (orientation == Qt::Horizontal) {
-        startRect.setWidth(qMin(rect.width() >>1 - 1, startRect.width()));
+        startRect.setWidth(qMin((rect.width() >> 1) - 1, startRect.width()));
         endRect = startRect.translated(rect.width() - startRect.width(), 0);
         middleRect.adjust(startRect.width(), 0, -startRect.width(), 0);
         if (startRect.bottomRight().x() > endRect.topLeft().x()) {
@@ -568,7 +568,7 @@ void QS60StylePrivate::drawRow(QS60StyleEnums::SkinParts start,
             endRect.adjust(overlap,0,0,0);
         }
     } else {
-        startRect.setHeight(qMin(rect.height() >>1 - 1, startRect.height()));
+        startRect.setHeight(qMin((rect.height() >> 1) - 1, startRect.height()));
         endRect = startRect.translated(0, rect.height() - startRect.height());
         middleRect.adjust(0, startRect.height(), 0, -startRect.height());
         if (startRect.topRight().y() > endRect.bottomLeft().y()) {
@@ -2038,16 +2038,12 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
 #endif //QT_NO_SPINBOX
     case PE_FrameFocusRect:
 // Calendar widget and combox both do not use styled itemDelegate
-        if ( widget && (
+        if (widget && !(false
 #ifndef QT_NO_CALENDARWIDGET
-             (qobject_cast<const QCalendarWidget *>(widget->parent()))
-#else
-             false
+            || qobject_cast<const QCalendarWidget *>(widget->parent())
 #endif //QT_NO_CALENDARWIDGET
 #ifndef QT_NO_COMBOBOX
-            || (qobject_cast<const QComboBoxListView *>(widget))
-#else
-            || false
+            || qobject_cast<const QComboBoxListView *>(widget)
 #endif //QT_NO_COMBOBOX
             )) {
             // no focus selection for touch
@@ -2326,6 +2322,7 @@ int QS60Style::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w
             break;
         case SH_UnderlineShortcut:
             retValue = 0;
+            break;
         default:
             break;
     }