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

OutputWindow: Fix read-onlyness for output windows

Browse Source 
... when setReadOnly is called before setFormatter (or setFormatter not
called at all).

Like the compile output window.

This amends commit 07645527a3.

Change-Id: I08ec2bcb2895df518915dcb1e8b102348b97cc23
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Orgad Shaneh
2019-04-17 17:29:42 +03:00
committed by Orgad Shaneh
parent 9d4c7b1c42
commit cdb4f6cdf0
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/coreplugin/outputwindow.cpp
View File

@@ -391,15 +391,20 @@ int OutputWindow::maxCharCount() const
bool OutputWindow::isReadOnly() const
{
if (d->formatter)
return d->formatter->plainTextEdit()->isReadOnly();
return false;
if (d->formatter) {
if (QPlainTextEdit *formatterEditor = d->formatter->plainTextEdit())
return formatterEditor->isReadOnly();
}
return QPlainTextEdit::isReadOnly();
}
void OutputWindow::setReadOnly(bool readOnly)
{
if (d->formatter)
d->formatter->plainTextEdit()->setReadOnly(readOnly);
QPlainTextEdit::setReadOnly(readOnly);
if (d->formatter) {
if (QPlainTextEdit *formatterEditor = d->formatter->plainTextEdit())
formatterEditor->setReadOnly(readOnly);
}
}
void OutputWindow::appendMessage(const QString &output, OutputFormat format)