feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/1.3'

Browse Source 
Conflicts:
	src/libs/cplusplus/CheckUndefinedSymbols.cpp
	src/plugins/qmleditor/qmlcodecompletion.cpp
This commit is contained in:
Erik Verbruggen
2009-10-06 11:41:00 +02:00
parent c3e08337fc 06abe6b813
commit 49f6b740cd
318 changed files with 2873 additions and 1577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/help/helpplugin.cpp
View File

@@ -478,7 +478,7 @@ void HelpPlugin::createRightPaneSideBar()
hboxLayout->addWidget(rightPaneToolBar);
hboxLayout->addStretch(5);
hboxLayout->addWidget(closeButton);
Core::Utils::StyledBar *w = new Core::Utils::StyledBar;
Utils::StyledBar *w = new Utils::StyledBar;
w->setLayout(hboxLayout);
connect(closeButton, SIGNAL(clicked()), this, SLOT(slotHideRightPane()));
@@ -633,9 +633,9 @@ void HelpPlugin::extensionsInitialized()
hc.addCustomFilter(tr("Unfiltered"), QStringList());
hc.setCustomValue(key, 1);
}
m_helpEngine->blockSignals(true);
bool blocked = m_helpEngine->blockSignals(true);
m_helpEngine->setCurrentFilter(tr("Unfiltered"));
m_helpEngine->blockSignals(false);
m_helpEngine->blockSignals(blocked);
needsSetup = true;
}