Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

4 files changed, 4 insertions, 26 deletions

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 9d76dcc..4234a7e 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -71,8 +71,8 @@ Qt {
     Q_ENUMS(ArrowType ToolButtonStyle PenStyle PenCapStyle PenJoinStyle BrushStyle)
     Q_ENUMS(FillRule MaskMode BGMode ClipOperation SizeMode)
     Q_ENUMS(BackgroundMode) // Qt3
-    Q_ENUMS(Axis Corner LayoutDirection SizeHint Orientation)
-    Q_FLAGS(Alignment Orientations)
+    Q_ENUMS(Axis Corner LayoutDirection SizeHint Orientation DropAction)
+    Q_FLAGS(Alignment Orientations DropActions)
     Q_FLAGS(DockWidgetAreas ToolBarAreas)
     Q_ENUMS(DockWidgetArea ToolBarArea)
     Q_ENUMS(TextFormat)
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp
index 7df49fa..ed2d676 100644
--- a/src/gui/dialogs/qdialog.cpp
+++ b/src/gui/dialogs/qdialog.cpp
@@ -673,28 +673,6 @@ void QDialog::keyPressEvent(QKeyEvent *e)
         case Qt::Key_Escape:
             reject();
             break;
-        case Qt::Key_Up:
-        case Qt::Key_Left:
-            if (focusWidget() &&
-                 (focusWidget()->focusPolicy() == Qt::StrongFocus ||
-                   focusWidget()->focusPolicy() == Qt::WheelFocus)) {
-                e->ignore();
-                break;
-            }
-            // call ours, since c++ blocks us from calling the one
-            // belonging to focusWidget().
-            focusNextPrevChild(false);
-            break;
-        case Qt::Key_Down:
-        case Qt::Key_Right:
-            if (focusWidget() &&
-                 (focusWidget()->focusPolicy() == Qt::StrongFocus ||
-                   focusWidget()->focusPolicy() == Qt::WheelFocus)) {
-                e->ignore();
-                break;
-            }
-            focusNextPrevChild(true);
-            break;
         default:
             e->ignore();
             return;
diff --git a/src/gui/kernel/qguiplatformplugin_p.h b/src/gui/kernel/qguiplatformplugin_p.h
index f7d4b92..2a70ee7 100644
--- a/src/gui/kernel/qguiplatformplugin_p.h
+++ b/src/gui/kernel/qguiplatformplugin_p.h
@@ -94,7 +94,7 @@ class Q_GUI_EXPORT QGuiPlatformPlugin : public QObject, public QGuiPlatformPlugi
         virtual QStringList iconThemeSearchPaths();
         virtual QIcon fileSystemIcon(const QFileInfo &);
 
-        enum PlatformHint { PH_ToolButtonStyle, PH_ToolBarIconSize };
+        enum PlatformHint { PH_ToolButtonStyle, PH_ToolBarIconSize, PH_ItemView_ActivateItemOnSingleClick };
         virtual int platformHint(PlatformHint hint);
 
 
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 612258a..5886512 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -5058,7 +5058,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget
         break;
 
     case SH_ItemView_ActivateItemOnSingleClick:
-        ret = false;
+        ret = qt_guiPlatformPlugin()->platformHint(QGuiPlatformPlugin::PH_ItemView_ActivateItemOnSingleClick);
         break;
 
     case SH_TitleBar_ModifyNotification: