diff --git a/src/plugins/help/helpmode.cpp b/src/plugins/help/helpmode.cpp index 7162264134a7c9a0daeab5f9520dfe711580b47e..5e85f0223f6b0a22fd684f1da3cc2898603a2a0f 100644 --- a/src/plugins/help/helpmode.cpp +++ b/src/plugins/help/helpmode.cpp @@ -30,15 +30,12 @@ #include "helpmode.h" #include "helpconstants.h" -#include <coreplugin/findplaceholder.h> - #include <QtGui/QWidget> -#include <QtGui/QLayout> using namespace Help; using namespace Help::Internal; -HelpMode::HelpMode(QWidget *widget, QWidget *centralWidget, QObject *parent) +HelpMode::HelpMode(QWidget *widget, QObject *parent) : BaseMode(parent) { setDisplayName(tr("Help")); @@ -46,8 +43,6 @@ HelpMode::HelpMode(QWidget *widget, QWidget *centralWidget, QObject *parent) setIcon(QIcon(QLatin1String(":/fancyactionbar/images/mode_Reference.png"))); setPriority(Constants::P_MODE_HELP); setWidget(widget); - centralWidget->layout()->setSpacing(0); - centralWidget->layout()->addWidget(new Core::FindToolBarPlaceHolder(centralWidget)); } diff --git a/src/plugins/help/helpmode.h b/src/plugins/help/helpmode.h index 05370d8b013d0d4410f41e144972a73b647e983c..c856a88bb7f2b5de9001b9499ea9673a40865dd5 100644 --- a/src/plugins/help/helpmode.h +++ b/src/plugins/help/helpmode.h @@ -42,7 +42,7 @@ class HelpMode : public Core::BaseMode Q_OBJECT public: - HelpMode(QWidget *widget, QWidget *centralWidget, QObject *parent = 0); + HelpMode(QWidget *widget, QObject *parent = 0); }; } // namespace Internal diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index b9ada606e3525342ec9b1d53fa26d03b58997964..28bdc2f2db49d58270244fee944ef0871eaafa2f 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -296,6 +296,11 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) mainWidgetLayout->addWidget(createToolBar()); mainWidgetLayout->addWidget(m_centralWidget); + if (QLayout *layout = m_centralWidget->layout()) { + layout->setSpacing(0); + layout->addWidget(new Core::FindToolBarPlaceHolder(m_centralWidget)); + } + HelpIndexFilter *helpIndexFilter = new HelpIndexFilter(); addAutoReleasedObject(helpIndexFilter); connect(helpIndexFilter, SIGNAL(linkActivated(QUrl)), this, @@ -310,7 +315,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) connect(m_core->modeManager(), SIGNAL(currentModeChanged(Core::IMode*, Core::IMode*)), this, SLOT(modeChanged(Core::IMode*, Core::IMode*))); - addAutoReleasedObject(m_mode = new HelpMode(m_splitter, m_centralWidget)); + addAutoReleasedObject(m_mode = new HelpMode(m_splitter)); m_mode->setContext(modecontext); return true;