diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:22 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:22 +0200 |
| commit | b58ec3b086518da5aa573f99426235854c23e35f (patch) | |
| tree | 861a9935d8f1cdba2fdca546836a351736dbddbf /src/quickdialogs | |
| parent | 4826f86e274f1b29bd769e6790824f9e62a40f62 (diff) | |
| parent | 22032227d16c39211e2ebceef97d21f4d89c7c87 (diff) | |
Merge tag 'v6.5.8-lts-lgpl' into 6.56.5
Qt 6.5.8-lts-lgpl release
Diffstat (limited to 'src/quickdialogs')
| -rw-r--r-- | src/quickdialogs/quickdialogs/qquickfiledialog.cpp | 12 | ||||
| -rw-r--r-- | src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/MessageDialog.qml | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/quickdialogs/quickdialogs/qquickfiledialog.cpp b/src/quickdialogs/quickdialogs/qquickfiledialog.cpp index 88b4047e40..a1f2f633eb 100644 --- a/src/quickdialogs/quickdialogs/qquickfiledialog.cpp +++ b/src/quickdialogs/quickdialogs/qquickfiledialog.cpp @@ -29,12 +29,12 @@ Q_LOGGING_CATEGORY(lcFileDialog, "qt.quick.dialogs.filedialog") \image qtquickdialogs-filedialog-gtk.png - To show a file dialog, construct an instance of FileDialog, set the - desired properties, and call \l {Dialog::}{open()}. The \l currentFile - or \l currentFiles properties can be used to determine the currently - selected file(s) in the dialog. The \l selectedFile and \l selectedFiles - properties are updated only after the final selection has been made by - accepting the dialog. + To show a file dialog, construct an instance of FileDialog, set the desired + properties, and call \l {Dialog::}{open()}. The \l currentFolder property + can be used to determine the folder in which the dialog opens. The + \l selectedFile and \l selectedFiles properties can be used to determine + which file(s) are selected when the dialog opens, and are also updated + when the user selects a file in the dialog and when the dialog is accepted. \snippet qtquickdialogs-filedialog.qml file diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/MessageDialog.qml index cb3eb1cc64..5e2b511a43 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/MessageDialog.qml +++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/MessageDialog.qml @@ -117,9 +117,9 @@ MessageDialogImpl { Layout.bottomMargin: 12 background: Rectangle { - color: Qt.rgba(1,1,1,1) + color: detailedTextArea.palette.base radius: 3 - border.color: Qt.darker(control.palette.light) + border.color: detailedTextArea.activeFocus ? Fusion.highlightedOutline(detailedTextArea.palette) : Fusion.outline(detailedTextArea.palette) border.width: 1 } } |