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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: I5e138bb7883c0436fee14ca6af20e99396676af1
This commit is contained in:
Eike Ziller
2020-11-20 13:00:37 +01:00
parent 937850a292 f7fa53d29b
commit 8d67dd57e8
54 changed files with 440 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/utils/aspects.cpp
View File

@@ -281,7 +281,7 @@ public:
std::function<void()> m_openTerminal;
bool m_readOnly = false;
bool m_undoRedoEnabled = false;
bool m_undoRedoEnabled = true;
bool m_enabled = true;
bool m_showToolTipOnLabel = false;
bool m_fileDialogOnly = false;
@@ -759,8 +759,7 @@ void StringAspect::addToLayout(LayoutBuilder &builder)
d->m_textEditDisplay->setEnabled(d->m_enabled);
d->m_textEditDisplay->setReadOnly(d->m_readOnly);
d->m_textEditDisplay->setUndoRedoEnabled(d->m_undoRedoEnabled);
d->m_textEditDisplay->setTextInteractionFlags
(Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse);
d->m_textEditDisplay->setTextInteractionFlags(Qt::TextEditorInteraction);
useMacroExpander(d->m_textEditDisplay);
connect(d->m_textEditDisplay, &QTextEdit::textChanged, this, [this] {
const QString value = d->m_textEditDisplay->document()->toPlainText();