forked from qt-creator/qt-creator
Utils: Show macroExpander icon only on non-readOnly StringAspects
Change-Id: Ib9c22c8e7b73c166452b4b18341fc81673c55535 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -488,11 +488,12 @@ void VariableChooserPrivate::updateCurrentEditor(QWidget *old, QWidget *widget)
|
|||||||
m_currentVariableName = widget->property(kVariableNameProperty).toByteArray();
|
m_currentVariableName = widget->property(kVariableNameProperty).toByteArray();
|
||||||
bool supportsVariables = chooser == q;
|
bool supportsVariables = chooser == q;
|
||||||
if (auto lineEdit = qobject_cast<QLineEdit *>(widget))
|
if (auto lineEdit = qobject_cast<QLineEdit *>(widget))
|
||||||
m_lineEdit = (supportsVariables ? lineEdit : nullptr);
|
m_lineEdit = (supportsVariables && !lineEdit->isReadOnly() ? lineEdit : nullptr);
|
||||||
else if (auto textEdit = qobject_cast<QTextEdit *>(widget))
|
else if (auto textEdit = qobject_cast<QTextEdit *>(widget))
|
||||||
m_textEdit = (supportsVariables ? textEdit : nullptr);
|
m_textEdit = (supportsVariables && !textEdit->isReadOnly() ? textEdit : nullptr);
|
||||||
else if (auto plainTextEdit = qobject_cast<QPlainTextEdit *>(widget))
|
else if (auto plainTextEdit = qobject_cast<QPlainTextEdit *>(widget))
|
||||||
m_plainTextEdit = (supportsVariables ? plainTextEdit : nullptr);
|
m_plainTextEdit = (supportsVariables && !plainTextEdit->isReadOnly() ?
|
||||||
|
plainTextEdit : nullptr);
|
||||||
|
|
||||||
QWidget *current = currentWidget();
|
QWidget *current = currentWidget();
|
||||||
if (current != previousWidget) {
|
if (current != previousWidget) {
|
||||||
|
Reference in New Issue
Block a user