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

Merge branch '2.3' into 2.4

Browse Source 
Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
This commit is contained in:
Oswald Buddenhagen
2011-10-18 13:50:38 +02:00
parent aa95055eb0 dd324e0634
commit 0164e1bea2
22 changed files with 29650 additions and 7007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/plaintexteditorfactory.cpp
View File

@@ -107,7 +107,7 @@ void PlainTextEditorFactory::updateEditorInfoBar(Core::IEditor *editor)
Core::InfoBarEntry info(Constants::INFO_SYNTAX_DEFINITION,
tr("A highlight definition was not found for this file. "
"Would you like to try to find one?"));
info.setCustomButtonInfo(tr("Show highlighter options"),
info.setCustomButtonInfo(tr("Show highlighter options..."),
textEditor, SLOT(acceptMissingSyntaxDefinitionInfo()));
info.setCancelButtonInfo(textEditor, SLOT(ignoreMissingSyntaxDefinitionInfo()));
file->infoBar()->addInfo(info);