diff options
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/divelogexportdialog.cpp | 3 | ||||
| -rw-r--r-- | qt-ui/divelogexportdialog.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp index cb7d6a02e..aff0265de 100644 --- a/qt-ui/divelogexportdialog.cpp +++ b/qt-ui/divelogexportdialog.cpp @@ -1,6 +1,7 @@ #include <QFileDialog> #include <QShortcut> #include <QSettings> +#include <QtConcurrent> #include "divelogexportdialog.h" #include "diveshareexportdialog.h" @@ -310,7 +311,7 @@ void DiveLogExportDialog::on_buttonBox_accepted() settings.endGroup(); // the non XSLT exports are called directly above, the XSLT based ons are called here if (!stylesheet.isEmpty()) - export_dives_xslt(filename.toUtf8(), ui->exportSelected->isChecked(), ui->CSVUnits_2->currentIndex(), stylesheet.toUtf8()); + future = QtConcurrent::run(export_dives_xslt, filename.toUtf8(), ui->exportSelected->isChecked(), ui->CSVUnits_2->currentIndex(), stylesheet.toUtf8()); } } diff --git a/qt-ui/divelogexportdialog.h b/qt-ui/divelogexportdialog.h index 0a603ced6..14f8f4539 100644 --- a/qt-ui/divelogexportdialog.h +++ b/qt-ui/divelogexportdialog.h @@ -3,6 +3,7 @@ #include <QDialog> #include <QTextStream> +#include <QFuture> #include "helpers.h" #include "statistics.h" @@ -27,6 +28,7 @@ slots: void on_exportGroup_buttonClicked(QAbstractButton *); private: + QFuture<int> future; Ui::DiveLogExportDialog *ui; void showExplanation(); void exportHtmlInit(const QString &filename); |