Merged revision 48679 #6ccaef90d4 from /trunk

------------------------------------------------------------------------
r48679 | zeljko | 2015-04-08 14:30:44 +0200 (Sri, 08 Tra 2015) | 2 lines

Qt: fixed build with -dQT_NATIVE_DIALOGS

------------------------------------------------------------------------

git-svn-id: branches/fixes_1_4@48715 -
This commit is contained in:
zeljko 2015-04-11 07:10:28 +00:00
parent a99b19b2d3
commit 856bf6acc0
2 changed files with 4 additions and 1 deletions

View File

@ -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;

View File

@ -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);