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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
This commit is contained in:
Eike Ziller
2012-12-18 17:42:04 +01:00
parent aa0dc33d32 4510d1ef84
commit 03717cf7ef
37 changed files with 372 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/help/generalsettingspage.cpp
View File

@@ -116,8 +116,7 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent)
if (m_searchKeywords.isEmpty()) {
QTextStream(&m_searchKeywords) << ' ' << m_ui->contextHelpLabel->text()
<< ' ' << m_ui->startPageLabel->text() << ' ' << m_ui->homePageLabel->text()
<< ' ' << m_ui->bookmarkGroupBox->title();
<< ' ' << m_ui->startPageLabel->text() << ' ' << m_ui->homePageLabel->text();
m_searchKeywords.remove(QLatin1Char('&'));
}