summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Bache-Wiig <jbache@trolltech.com>2010-03-18 17:36:50 (GMT)
committerJens Bache-Wiig <jbache@trolltech.com>2010-03-18 17:37:54 (GMT)
commitb6dcc8faf73d63a281f5cd9c0ef80ef5db367532 (patch)
tree563ca3064ef188325e5aff1596d3b2941903ff7b
parent0f500da44e87ba80dbe09c4f8b392451bf000e78 (diff)
downloadQt-b6dcc8faf73d63a281f5cd9c0ef80ef5db367532.zip
Qt-b6dcc8faf73d63a281f5cd9c0ef80ef5db367532.tar.gz
Qt-b6dcc8faf73d63a281f5cd9c0ef80ef5db367532.tar.bz2
Dont force height for filter widget
This had some negative side effects when used in Qt Creator and since the kde icon now fits nicely without this workaround I will remove it for now.
-rw-r--r--tools/designer/src/lib/shared/filterwidget.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/designer/src/lib/shared/filterwidget.cpp b/tools/designer/src/lib/shared/filterwidget.cpp
index 84810cb..f485346 100644
--- a/tools/designer/src/lib/shared/filterwidget.cpp
+++ b/tools/designer/src/lib/shared/filterwidget.cpp
@@ -162,18 +162,11 @@ FilterWidget::FilterWidget(QWidget *parent, LayoutMode lm) :
// Let the style determine minimum height for our widget
QSize size(ICONBUTTON_SIZE + 2, ICONBUTTON_SIZE + 2);
- QStyleOptionFrame frameOpt;
- frameOpt.initFrom(m_editor);
- QSize adjustedSize = style()->sizeFromContents(QStyle::CT_LineEdit, &frameOpt, size, m_editor);
-
// Note KDE does not reserve space for the highlight color
if (style()->inherits("OxygenStyle")) {
- adjustedSize = adjustedSize.expandedTo(QSize(0, 32));
size = size.expandedTo(QSize(24, 0));
}
- m_editor->setMinimumHeight(adjustedSize.height());
-
// Make room for clear icon
QMargins margins = m_editor->textMargins();
if (layoutDirection() == Qt::LeftToRight)