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: Iea84f23cf394de13e99a9ed777c8c113e4eff473
This commit is contained in:
Eike Ziller
2020-11-19 15:38:13 +01:00
parent b269066435 9b6944086b
commit 5ca70bdcb3
271 changed files with 2816 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -147,7 +147,7 @@ void QmlJSEditorWidget::finalizeInitialization()
}
connect(this->document(), &QTextDocument::modificationChanged,
this, &QmlJSEditorWidget::modificationChanged);
this, &QmlJSEditorWidget::updateModificationChange);
connect(m_qmlJsEditorDocument, &QmlJSEditorDocument::updateCodeWarnings,
this, &QmlJSEditorWidget::updateCodeWarnings);
@@ -257,7 +257,7 @@ void QmlJSEditorWidget::foldAuxiliaryData()
}
}
void QmlJSEditorWidget::modificationChanged(bool changed)
void QmlJSEditorWidget::updateModificationChange(bool changed)
{
if (!changed && m_modelManager)
m_modelManager->fileChangedOnDisk(textDocument()->filePath().toString());

2
src/plugins/qmljseditor/qmljseditor.h
View File

@@ -80,7 +80,7 @@ signals:
void selectedElementsChanged(QList<QmlJS::AST::UiObjectMember*> offsets,
const QString &wordAtCursor);
private:
void modificationChanged(bool);
void updateModificationChange(bool);
void jumpToOutlineElement(int index);
void updateContextPane();

1
src/plugins/qmljseditor/qmljshoverhandler.cpp
View File

@@ -50,7 +50,6 @@
#include <QDir>
#include <QList>
#include <QStringRef>
#include <QRegularExpression>
#include <QRegularExpressionMatch>