Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Corrected case mismatch.
  Fixed pro file syntax in demos/spectrum
  Fix for failing autotest QToolBar/Symbian
  Removed useless Exit button in Symbian^3

4 files changed, 16 insertions, 9 deletions

diff --git a/demos/spectrum/spectrum.pri b/demos/spectrum/spectrum.pri
index 5773900..75c0113 100644
--- a/demos/spectrum/spectrum.pri
+++ b/demos/spectrum/spectrum.pri
@@ -41,9 +41,9 @@ win32 {
     #     ..$${spectrum_build_dir}
     # without the result having a trailing slash where spectrum_build_dir
     # is undefined.
-    spectrum_build_dir = /release
-    if (!debug_and_release|build_pass): CONFIG(debug, debug|release) {
-        spectrum_build_dir = /debug
+    build_pass {
+        CONFIG(release, release|debug): spectrum_build_dir = /release
+        CONFIG(debug, release|debug): spectrum_build_dir = /debug
     }
 }
 
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp
index 3496297..09e2b5f 100644
--- a/src/gui/kernel/qsoftkeymanager_s60.cpp
+++ b/src/gui/kernel/qsoftkeymanager_s60.cpp
@@ -113,12 +113,20 @@ void QSoftKeyManagerPrivateS60::ensureCbaVisibilityAndResponsiviness(CEikButtonG
 
 void QSoftKeyManagerPrivateS60::clearSoftkeys(CEikButtonGroupContainer &cba)
 {
+#ifdef SYMBIAN_VERSION_SYMBIAN3
+    QT_TRAP_THROWING(
+        //EAknSoftkeyEmpty is used, because using -1 adds softkeys without actions on Symbian3
+        cba.SetCommandL(0, EAknSoftkeyEmpty, KNullDesC);
+        cba.SetCommandL(2, EAknSoftkeyEmpty, KNullDesC);
+    );
+#else
     QT_TRAP_THROWING(
         //Using -1 instead of EAknSoftkeyEmpty to avoid flickering.
         cba.SetCommandL(0, -1, KNullDesC);
         // TODO: Should we clear also middle SK?
         cba.SetCommandL(2, -1, KNullDesC);
     );
+#endif
     realSoftKeyActions.clear();
 }
 
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index aa68c23..da1528e 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -2556,17 +2556,16 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt,
                         tb->sizePolicy().horizontalPolicy() == QSizePolicy::Maximum) && tb->orientation() == Qt::Horizontal;
 
                 if (parentCanGrowHorizontally) {
-                    int visibleButtons = 0;
+                    int buttons = 0;
                     //Make the auto-stretch to happen only for horizontal orientation
                     if (tb && tb->orientation() == Qt::Horizontal) {
                         QList<QAction*> actionList =  tb->actions();
                         for (int i = 0; i < actionList.count(); i++) {
-                            if (actionList.at(i)->isVisible())
-                                visibleButtons++;
+                            buttons++;
                         }
                     }
 
-                    if (widget->parentWidget() && visibleButtons > 0) {
+                    if (widget->parentWidget() && buttons > 0) {
                         QWidget *w = const_cast<QWidget *>(widget);
                         int toolBarMaxWidth = 0;
                         int totalMargin = 0;
@@ -2589,7 +2588,7 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt,
                         toolBarMaxWidth -= totalMargin;
 
                         //ensure that buttons are side-by-side and not on top of each other
-                        const int toolButtonWidth = (toolBarMaxWidth / visibleButtons)
+                        const int toolButtonWidth = (toolBarMaxWidth / buttons)
                                 - pixelMetric(QStyle::PM_ToolBarItemSpacing)
                                 - pixelMetric(QStyle::PM_ToolBarItemMargin)
                         //toolbar frame needs to be reduced again, since QToolBarLayout adds it for each toolbar action
diff --git a/tests/auto/qdir/qdir.pro b/tests/auto/qdir/qdir.pro
index cf612f1..d81e428 100644
--- a/tests/auto/qdir/qdir.pro
+++ b/tests/auto/qdir/qdir.pro
@@ -4,7 +4,7 @@ RESOURCES += qdir.qrc
 QT        = core
 
 wince*|symbian {
-  DirFiles.sources = testdir testdata searchdir resources entrylist types tst_qdir.cpp
+  DirFiles.sources = testdir testData searchdir resources entrylist types tst_qdir.cpp
   DirFiles.path = .
   DEPLOYMENT += DirFiles
 }