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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: I8d1c9720a868da02b3157a48954eb4e262539c84
This commit is contained in:
Eike Ziller
2023-06-15 09:48:58 +02:00
parent e7870f736d 580202f54b
commit 6c601b8cd4
67 changed files with 1046 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidmanifestdocument.cpp
View File

@@ -25,10 +25,12 @@ AndroidManifestDocument::AndroidManifestDocument(AndroidManifestEditorWidget *ed
this, &Core::IDocument::changed);
}
bool AndroidManifestDocument::save(QString *errorString, const Utils::FilePath &filePath, bool autoSave)
bool AndroidManifestDocument::saveImpl(QString *errorString,
const Utils::FilePath &filePath,
bool autoSave)
{
m_editorWidget->preSave();
bool result = TextDocument::save(errorString, filePath, autoSave);
bool result = TextDocument::saveImpl(errorString, filePath, autoSave);
m_editorWidget->postSave();
return result;
}

7
src/plugins/android/androidmanifestdocument.h
View File

@@ -14,12 +14,15 @@ class AndroidManifestDocument : public TextEditor::TextDocument
{
public:
explicit AndroidManifestDocument(AndroidManifestEditorWidget *editorWidget);
bool save(QString *errorString, const Utils::FilePath &filePath,
bool autoSave = false) override;
bool isModified() const override;
bool isSaveAsAllowed() const override;
protected:
bool saveImpl(QString *errorString,
const Utils::FilePath &filePath,
bool autoSave = false) override;
private:
AndroidManifestEditorWidget *m_editorWidget;
};