diff options
| author | hjk <hjk@qt.io> | 2021-08-11 09:01:53 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2021-08-17 12:54:08 +0000 |
| commit | 8885ef7e5aa66bc1a4e9541c46d90a46bdeca1b3 (patch) | |
| tree | 7c5903139aa68627531d7fdbc7fc2cfe6d7b4bd6 /src/plugins/diffeditor/diffeditorplugin.cpp | |
| parent | 7726267d071cb0c3d6dfad8ee4d1551140fcb06a (diff) | |
| download | qt-creator-8885ef7e5aa66bc1a4e9541c46d90a46bdeca1b3.tar.gz | |
Utils: Pass dialog parent to Utils::* file dialog
Amends 3edc5673b58e55.
Turns out quite a few potential uses have other parents than
ICore::dialogParent().
Use a nullptr parent to mean ICore::dialogParent() to keep the
caller side simple.
Change-Id: Icfe1daafd710ae273d286679e0c8e2a3a27da552
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorplugin.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 5fb59e4e9e..624de7002b 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -566,13 +566,13 @@ void DiffEditorPluginPrivate::diffOpenFiles() void DiffEditorPluginPrivate::diffExternalFiles() { - const FilePath filePath1 = FileUtils::getOpenFilePath(tr("Select First File for Diff")); + const FilePath filePath1 = FileUtils::getOpenFilePath(nullptr, tr("Select First File for Diff")); if (filePath1.isEmpty()) return; if (EditorManager::skipOpeningBigTextFile(filePath1)) return; - const FilePath filePath2 = FileUtils::getOpenFilePath(tr("Select Second File for Diff")); + const FilePath filePath2 = FileUtils::getOpenFilePath(nullptr, tr("Select Second File for Diff")); if (filePath2.isEmpty()) return; if (EditorManager::skipOpeningBigTextFile(filePath2)) |