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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Conflicts:
	src/plugins/autotest/testresultspane.cpp
	src/plugins/cmakeprojectmanager/cmaketool.cpp

Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0
This commit is contained in:
Eike Ziller
2019-11-19 17:01:08 +01:00
committed by Orgad Shaneh
parent fd8afd564f e53e0a808b
commit 4e6142c932
125 changed files with 5446 additions and 2030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/texteditor/texteditor.cpp
View File

@@ -8440,8 +8440,9 @@ void TextEditorWidget::setupGenericHighlighter()
// TextEditorLinkLabel
//
TextEditorLinkLabel::TextEditorLinkLabel(QWidget *parent)
: QLabel(parent)
: Utils::ElidingLabel(parent)
{
setElideMode(Qt::ElideMiddle);
}
void TextEditorLinkLabel::setLink(Utils::Link link)