diff options
| author | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2010-03-01 16:04:38 (GMT) |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2010-03-01 16:04:38 (GMT) |
| commit | f2dd19b1ad656f18991b543b32c5eae9cfbc28d0 (patch) | |
| tree | 7fe399e90a99aca938459e85fe12db59d067dcac | |
| parent | a7196feb11d701dd486e66fd06cbc50d84c9b1bb (diff) | |
| parent | a07ac42868df345994ee2a5d27ff79f2e3599ead (diff) | |
| download | Qt-f2dd19b1ad656f18991b543b32c5eae9cfbc28d0.zip Qt-f2dd19b1ad656f18991b543b32c5eae9cfbc28d0.tar.gz Qt-f2dd19b1ad656f18991b543b32c5eae9cfbc28d0.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/findwidget.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -83,7 +83,7 @@ bin/kmap2qmap* bin/qlalr* bin/qmlconv* bin/qmldebugger* -bin/qmlviewer* +bin/qml* bin/qttracereplay* configure.cache config.status diff --git a/tools/assistant/tools/assistant/findwidget.cpp b/tools/assistant/tools/assistant/findwidget.cpp index 2e40ab0..60318d4 100644 --- a/tools/assistant/tools/assistant/findwidget.cpp +++ b/tools/assistant/tools/assistant/findwidget.cpp @@ -72,6 +72,7 @@ FindWidget::FindWidget(QWidget *parent) toolClose = setupToolButton(QLatin1String(""), resourcePath + QLatin1String("/closetab.png")); hboxLayout->addWidget(toolClose); + connect(toolClose, SIGNAL(clicked()), SLOT(hide())); editFind = new QLineEdit(this); hboxLayout->addWidget(editFind); |