diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-08-19 09:01:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-08-19 12:48:27 +0200 |
| commit | 64247bf571eb8a383b039e29a30a7efa061dae1b (patch) | |
| tree | 9e6a1985d7d2439e4fe503f6940c3f5681626ecf /src/plugins/python/pythoneditor.cpp | |
| parent | 33001a866f400c03041ecbad2b5de630a7ca697e (diff) | |
| parent | aa5b971dca898ad5eb844a684c7f83b0ccbad983 (diff) | |
| download | qt-creator-64247bf571eb8a383b039e29a30a7efa061dae1b.tar.gz | |
Merge remote-tracking branch 'origin/8.0'
Reverts/comments out parts of 45f93a817a527e6dc81a8971dd2868b3da66cd84,
which needs to be resolved in a follow-up commit.
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
src/plugins/python/pythoneditor.cpp
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
src/plugins/scxmleditor/common/colorsettings.cpp
Change-Id: I7f0f7b7120e75a9fc3a8886bc57c17345cbb501b
Diffstat (limited to 'src/plugins/python/pythoneditor.cpp')
| -rw-r--r-- | src/plugins/python/pythoneditor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/python/pythoneditor.cpp b/src/plugins/python/pythoneditor.cpp index 9775fc8982..302af8a8fc 100644 --- a/src/plugins/python/pythoneditor.cpp +++ b/src/plugins/python/pythoneditor.cpp @@ -117,13 +117,13 @@ public: if (python.exists()) PyLSConfigureAssistant::openDocumentWithPython(python, this); }); + connect(this, &PythonDocument::openFinishedSuccessfully, + this, &PythonDocument::checkForPyls); } - void setFilePath(const FilePath &filePath) override + void checkForPyls() { - TextEditor::TextDocument::setFilePath(filePath); - - const FilePath &python = detectPython(filePath); + const FilePath &python = detectPython(filePath()); if (!python.exists()) return; |