diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-22 08:30:34 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-02-22 08:30:34 -0800 |
| commit | 2866a604b453a3d86c76e37ec32db36671be86ba (patch) | |
| tree | 713b780385cea6f0f662c03ae60386521f9ecfc3 /qt-ui/divelogexportdialog.cpp | |
| parent | df73f328f88fbb2eccf30886836f9a4d548532a4 (diff) | |
| download | subsurface-2866a604b453a3d86c76e37ec32db36671be86ba.tar.gz | |
Revert "Update Qt4 patch"
This reverts commit 762315e7eef47c1a5357e9c8691676707e3c630e.
Oops, this was supposed to update the patch, not update and apply it.
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, 1 insertions, 6 deletions
diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp index 8c6d2899f..43c41550f 100644 --- a/qt-ui/divelogexportdialog.cpp +++ b/qt-ui/divelogexportdialog.cpp @@ -1,9 +1,8 @@ #include <QFileDialog> #include <QShortcut> #include <QSettings> -#if QT_VERSION >= 0x050000 #include <QtConcurrent> -#endif + #include "divelogexportdialog.h" #include "diveshareexportdialog.h" #include "ui_divelogexportdialog.h" @@ -314,11 +313,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()) -#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 } } |