Add missing find tool bar placeholders.

src/plugins/coreplugin/mainwindow.cpp

@@ -303,7 +303,6 @@ bool MainWindow::init(QString *errorMessage)
     oph->setCloseable(false);
     outputModeWidget->layout()->addWidget(oph);
     oph->setVisible(true); // since the output pane placeholder is invisible at startup by default (which makes sense in most cases)
-    outputModeWidget->layout()->addWidget(new Core::FindToolBarPlaceHolder(outputModeWidget));
     outputModeWidget->setFocusProxy(oph);
 
     connect(m_modeManager, SIGNAL(currentModeChanged(Core::IMode*)),

src/plugins/coreplugin/outputpane.cpp

@@ -37,6 +37,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/findplaceholder.h>
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -204,6 +205,7 @@ 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);
     setLayout(mainlayout);
 

src/plugins/debugger/debuggeroutputwindow.cpp

@@ -48,6 +48,7 @@
 #ifndef GDBDEBUGGERLEAN
 
 #include <aggregation/aggregate.h>
+#include <coreplugin/findplaceholder.h>
 #include <find/basetextfind.h>
 
 using namespace Find;
@@ -309,8 +310,12 @@ DebuggerOutputWindow::DebuggerOutputWindow(QWidget *parent)
     m_splitter->addWidget(m_inputText);
     m_splitter->addWidget(m_combinedText);
 
-    QGridLayout *layout = new QGridLayout(this);
+    QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setMargin(0);
+    layout->setSpacing(0);
+#ifndef GDBDEBUGGERLEAN
+    layout->addWidget(new Core::FindToolBarPlaceHolder(this));
+#endif
     layout->addWidget(m_splitter);
     setLayout(layout);