diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-04-17 17:29:42 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2019-04-18 14:52:29 +0000 |
| commit | cdb4f6cdf0a6a2c632a2c1d9407a9f8ddf6e3a95 (patch) | |
| tree | f569f894837df8ff0535530c94648f0d175bea32 | |
| parent | 9d4c7b1c42bf8f0a834a7517ecd8266a3a416c5b (diff) | |
OutputWindow: Fix read-onlyness for output windows
... when setReadOnly is called before setFormatter (or setFormatter not
called at all).
Like the compile output window.
This amends commit 07645527a37e04ecde7eb79a5ca47af745d84916.
Change-Id: I08ec2bcb2895df518915dcb1e8b102348b97cc23
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/plugins/coreplugin/outputwindow.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp index 46807e6534..7a85a251f0 100644 --- a/src/plugins/coreplugin/outputwindow.cpp +++ b/src/plugins/coreplugin/outputwindow.cpp @@ -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) |