diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 10:42:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 10:42:55 (GMT) |
| commit | f3d4d5534e2a5e83ca2ec7bddefde08e4343df87 (patch) | |
| tree | 350257d83293806bd5348c6287f97c61acd01ca5 | |
| parent | ed08d67fea713e550da0fd0542672cc4443806e2 (diff) | |
| parent | c3a8819a68cff387178a0f37de62611b98e0a665 (diff) | |
| download | Qt-f3d4d5534e2a5e83ca2ec7bddefde08e4343df87.zip Qt-f3d4d5534e2a5e83ca2ec7bddefde08e4343df87.tar.gz Qt-f3d4d5534e2a5e83ca2ec7bddefde08e4343df87.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use a toolbar for the designer property editor
Cleanup: Removed include file and comment.
| -rw-r--r-- | src/testlib/qtestcoreelement.h | 5 | ||||
| -rw-r--r-- | tools/designer/src/components/widgetbox/widgetbox.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/testlib/qtestcoreelement.h b/src/testlib/qtestcoreelement.h index 4738f7d..e1ad44a 100644 --- a/src/testlib/qtestcoreelement.h +++ b/src/testlib/qtestcoreelement.h @@ -45,8 +45,6 @@ #include <QtTest/qtestcorelist.h> #include <QtTest/qtestelementattribute.h> -#include <cstdlib> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -95,9 +93,6 @@ void QTestCoreElement<ElementType>::addAttribute(const QTest::AttributeIndex att if (attribute(attributeIndex)) return; - // if (attributeIndex == QTest::AI_Metric) - // abort(); - QTestElementAttribute *testAttribute = new QTestElementAttribute; testAttribute->setPair(attributeIndex, value); testAttribute->addToList(&listOfAttributes); 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)), |