summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-03-17 11:44:34 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-03-17 11:44:34 (GMT)
commit2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1 (patch)
tree352e76fc210605d285be6d72857a6bbd7db107f9 /tools
parentd28a81d51734afd1f3a052f4c4e9fc90aef393e8 (diff)
parent7e9052cc1f16b3eeabb73ada9492d91620df796d (diff)
downloadQt-2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1.zip
Qt-2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1.tar.gz
Qt-2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools')
-rw-r--r--tools/designer/src/components/widgetbox/widgetbox.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/designer/src/components/widgetbox/widgetbox.cpp b/tools/designer/src/components/widgetbox/widgetbox.cpp
index 512d6ba..091135a 100644
--- a/tools/designer/src/components/widgetbox/widgetbox.cpp
+++ b/tools/designer/src/components/widgetbox/widgetbox.cpp
@@ -74,7 +74,10 @@ WidgetBox::WidgetBox(QDesignerFormEditorInterface *core, QWidget *parent, Qt::Wi
FilterWidget *filterWidget = new FilterWidget(0, FilterWidget::LayoutAlignNone);
filterWidget->setRefuseFocus(true);
connect(filterWidget, SIGNAL(filterChanged(QString)), m_view, SLOT(filter(QString)));
- l->addWidget(filterWidget);
+
+ QToolBar *toolBar = new QToolBar(this);
+ toolBar->addWidget(filterWidget);
+ l->addWidget(toolBar);
// View
connect(m_view, SIGNAL(pressed(QString,QString,QPoint)),