Back to the bottom.

src/plugins/coreplugin/editormanager/editorview.cpp

@@ -145,9 +145,6 @@ EditorView::EditorView(OpenEditorsModel *model, QWidget *parent) :
         connect(m_lockButton, SIGNAL(clicked()), this, SLOT(makeEditorWritable()));
         connect(m_closeButton, SIGNAL(clicked()), this, SLOT(closeView()), Qt::QueuedConnection);
     }
-    {
-        tl->addWidget(new FindToolBarPlaceHolder(this));
-    }
     {
         m_infoWidget->setFrameStyle(QFrame::Panel | QFrame::Raised);
         m_infoWidget->setLineWidth(1);
@@ -180,6 +177,8 @@ EditorView::EditorView(OpenEditorsModel *model, QWidget *parent) :
 
     tl->addWidget(m_container);
 
+    tl->addWidget(new FindToolBarPlaceHolder(this));
+
     {
         m_statusHLine->setFrameStyle(QFrame::HLine);
 

src/plugins/coreplugin/outputpane.cpp

@@ -205,8 +205,8 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
     toolLayout->addWidget(m_opToolBarWidgets);
     toolLayout->addWidget(m_closeButton);
     mainlayout->addWidget(m_toolBar);
-    mainlayout->addWidget(new Core::FindToolBarPlaceHolder(this));
     mainlayout->addWidget(m_outputWidgetPane, 10);
+    mainlayout->addWidget(new Core::FindToolBarPlaceHolder(this));
     setLayout(mainlayout);
 
     m_buttonsWidget = new QWidget;

src/plugins/debugger/debuggeroutputwindow.cpp

@@ -313,10 +313,10 @@ DebuggerOutputWindow::DebuggerOutputWindow(QWidget *parent)
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setMargin(0);
     layout->setSpacing(0);
+    layout->addWidget(m_splitter);
 #ifndef GDBDEBUGGERLEAN
     layout->addWidget(new Core::FindToolBarPlaceHolder(this));
 #endif
-    layout->addWidget(m_splitter);
     setLayout(layout);
 
 #ifndef GDBDEBUGGERLEAN

src/plugins/find/findtoolbar.cpp

@@ -74,7 +74,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     //setup ui
     m_ui.setupUi(this);
     setFocusProxy(m_ui.findEdit);
-//    setProperty("topBorder", true);
+    setProperty("topBorder", true);
     setSingleRow(false);
     m_ui.findEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
     m_ui.replaceEdit->setAttribute(Qt::WA_MacShowFocusRect, false);

src/plugins/help/helpplugin.cpp

@@ -474,12 +474,12 @@ void HelpPlugin::createRightPaneSideBar()
     addAutoReleasedObject(new Core::BaseRightPaneWidget(m_rightPaneSideBar));
 
     rightPaneLayout->addWidget(w);
-    rightPaneLayout->addWidget(new Core::FindToolBarPlaceHolder(m_rightPaneSideBar));
     m_helpViewerForSideBar = new HelpViewer(m_helpEngine, 0);
     Aggregation::Aggregate *agg = new Aggregation::Aggregate();
     agg->add(m_helpViewerForSideBar);
     agg->add(new HelpViewerFindSupport(m_helpViewerForSideBar));
     rightPaneLayout->addWidget(m_helpViewerForSideBar);
+    rightPaneLayout->addWidget(new Core::FindToolBarPlaceHolder(m_rightPaneSideBar));
 #if defined(QT_NO_WEBKIT)
     QFont font = m_helpViewerForSideBar->font();
     font = qVariantValue<QFont>(m_helpEngine->customValue(QLatin1String("font"),