diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas index 06c604e063..55628eba96 100644 --- a/lcl/interfaces/qt/qtwidgets.pas +++ b/lcl/interfaces/qt/qtwidgets.pas @@ -18261,8 +18261,10 @@ end; function TQtFilePreviewDialog.CreateWidget(parent: QWidgetH; f: QtWindowFlags ): QWidgetH; begin + {$ifndef QT_NATIVE_DIALOGS} FPreviewWidget := nil; FTextWidget := nil; + {$endif} Result := inherited CreateWidget(parent, f); end; diff --git a/lcl/interfaces/qt/qtwsdialogs.pp b/lcl/interfaces/qt/qtwsdialogs.pp index 3af45b2e25..87d4ea25a5 100644 --- a/lcl/interfaces/qt/qtwsdialogs.pp +++ b/lcl/interfaces/qt/qtwsdialogs.pp @@ -651,8 +651,9 @@ begin {. $note WE MUST USE NON NATIVE DIALOGS HERE, OTHERWISE NO SIGNALS #16532.} QFileDialog_setOption(QFileDialogH(FileDialog.Widget), QFileDialogDontUseNativeDialog, True); - + {$ifndef QT_NATIVE_DIALOGS} FileDialog.initializePreview(TPreviewFileDialog(ACommonDialog).PreviewFileControl); + {$endif} FileDialog.AttachEvents; Result := THandle(FileDialog);