diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-19 21:52:41 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-02-19 21:52:41 -0800 |
| commit | 762315e7eef47c1a5357e9c8691676707e3c630e (patch) | |
| tree | 8c1a25f1a026e920ff416677a759eb3708aa38f2 /qt-ui/divelogexportdialog.cpp | |
| parent | 6a2efd9ff6e3657c35612f65c322ded25c984532 (diff) | |
| download | subsurface-762315e7eef47c1a5357e9c8691676707e3c630e.tar.gz | |
Update Qt4 patch
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/divelogexportdialog.cpp')
| -rw-r--r-- | qt-ui/divelogexportdialog.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp index 43c41550f..8c6d2899f 100644 --- a/qt-ui/divelogexportdialog.cpp +++ b/qt-ui/divelogexportdialog.cpp @@ -1,8 +1,9 @@ #include <QFileDialog> #include <QShortcut> #include <QSettings> +#if QT_VERSION >= 0x050000 #include <QtConcurrent> - +#endif #include "divelogexportdialog.h" #include "diveshareexportdialog.h" #include "ui_divelogexportdialog.h" @@ -313,7 +314,11 @@ 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()) +#if QT_VERSION >= 0x050000 future = QtConcurrent::run(export_dives_xslt, filename.toUtf8(), ui->exportSelected->isChecked(), ui->CSVUnits_2->currentIndex(), stylesheet.toUtf8()); +#else + export_dives_xslt(filename.toUtf8(), ui->exportSelected->isChecked(), ui->CSVUnits_2->currentIndex(), stylesheet.toUtf8()); +#endif } } |