Vincent van Ravesteijn wrote:
>> But preview is still broken under Windows.
>>
>> Peter
>>
>
> I didn't fix it ?
>
> Vincent
>
No not here. Would this patch be OK?
Index: src/frontends/qt4/GuiView.cpp
===================================================================
--- src/frontends/qt4/GuiView.cpp (Revision 32590)
+++ src/frontends/qt4/GuiView.cpp (Arbeitskopie)
@@ -2687,7 +2687,7 @@
format = doc_buffer->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
QFuture<docstring> f =
QtConcurrent::run(exportAndDestroy,
- doc_buffer->clone(), cmd.argument());
+ doc_buffer->clone(), from_utf8(format));
d.setPreviewFuture(f);
#else
doc_buffer->doExport(format, true);
@@ -2702,7 +2702,7 @@
format = doc_buffer->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
QFuture<docstring> f =
QtConcurrent::run(previewAndDestroy,
- doc_buffer->clone(), cmd.argument());
+ doc_buffer->clone(), from_utf8(format));
d.setPreviewFuture(f);
#else
doc_buffer->preview(format);
@@ -2718,7 +2718,7 @@
format = master->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
QFuture<docstring> f =
QtConcurrent::run(exportAndDestroy,
- master->clone(), cmd.argument());
+ master->clone(), from_utf8(format));
d.setPreviewFuture(f);
#else
master->doExport(format, true);
@@ -2732,7 +2732,7 @@
format = master->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
QFuture<docstring> f =
QtConcurrent::run(previewAndDestroy,
- master->clone(), cmd.argument());
+ master->clone(), from_utf8(format));
d.setPreviewFuture(f);
#else
master->preview(format);
When I change the function parameter for format from docstring to
std:string I get linker errors with mavc, because of missing
previewAndDestroy and exportAndDestroy, stange.
Thereforethe from_utf8 function.
Peter
