diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-11-25 09:48:25 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-11-25 09:48:25 +0100 |
| commit | e2b0835b58aefdab91edda097c1180dae08058f6 (patch) | |
| tree | 5c26a165c4956d87b3d9cc5568b590276541f5e0 /src/plugins/find | |
| parent | 84aa93c2bbdd4b9e9bb84df78261abd343c07471 (diff) | |
| parent | 7ff81c435af06179fd64147a72f55e884e299cef (diff) | |
| download | qt-creator-e2b0835b58aefdab91edda097c1180dae08058f6.tar.gz | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljstypedescriptionreader.cpp
src/plugins/analyzerbase/startremotedialog.ui
src/plugins/qmldesigner/designercore/include/rewriterview.h
src/plugins/qt4projectmanager/makestep.cpp
Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
Diffstat (limited to 'src/plugins/find')
| -rw-r--r-- | src/plugins/find/searchresultwindow.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp index f5e04a2ece..27233ef970 100644 --- a/src/plugins/find/searchresultwindow.cpp +++ b/src/plugins/find/searchresultwindow.cpp @@ -48,6 +48,7 @@ #include <QtGui/QFont> #include <QtGui/QAction> #include <QtGui/QComboBox> +#include <QtGui/QScrollArea> #include <QtGui/QStackedWidget> static const char SETTINGSKEYSECTIONNAME[] = "SearchResults"; @@ -209,7 +210,10 @@ SearchResultWindow::SearchResultWindow(QWidget *newSearchPanel) d->m_widget = new QStackedWidget; d->m_widget->setWindowTitle(displayName()); - d->m_widget->addWidget(newSearchPanel); + QScrollArea *newSearchArea = new QScrollArea(d->m_widget); + newSearchArea->setFrameStyle(QFrame::NoFrame); + newSearchArea->setWidget(newSearchPanel); + d->m_widget->addWidget(newSearchArea); d->m_currentIndex = 0; d->m_expandCollapseButton = new QToolButton(d->m_widget); @@ -400,7 +404,7 @@ void SearchResultWindow::setTextEditorFont(const QFont &font) void SearchResultWindow::openNewSearchPanel() { d->setCurrentIndex(0); - popup(); + popup(true/*focus*/, true/*sizeHint*/); } /*! |