summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-11-18 09:28:59 (GMT)
committeraxis <qt-info@nokia.com>2009-11-18 09:28:59 (GMT)
commitdb3efe5bf4d03d6fcdbf435c2445203bb07475f9 (patch)
tree36da498928e2b27f3b17e9613df08aaa93ce0201 /src/gui/styles
parent484a6043ef84df3d0d01a19247ea2c89eb8b309f (diff)
parent31d29b227a7609ab0dadca4244cafec919264ba8 (diff)
downloadQt-db3efe5bf4d03d6fcdbf435c2445203bb07475f9.zip
Qt-db3efe5bf4d03d6fcdbf435c2445203bb07475f9.tar.gz
Qt-db3efe5bf4d03d6fcdbf435c2445203bb07475f9.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-staging2
Diffstat (limited to 'src/gui/styles')
-rw-r--r--src/gui/styles/qs60style.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 467cc84..b5c0d4f 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -67,6 +67,7 @@
#include "qtoolbar.h"
#include "qtoolbutton.h"
#include "qfocusframe.h"
+#include "qformlayout.h"
#include "private/qtoolbarextension_p.h"
#include "private/qcombobox_p.h"
@@ -2401,6 +2402,9 @@ int QS60Style::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w
case SH_RequestSoftwareInputPanel:
retValue = RSIP_OnMouseClickAndAlreadyFocused;
break;
+ case SH_FormLayoutWrapPolicy:
+ retValue = QFormLayout::WrapLongRows;
+ break;
default:
break;
}