mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Update Qt4 patch"

Browse source 
This reverts commit 762315e7ee.

Oops, this was supposed to update the patch, not update and apply it.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-02-22 08:30:34 -08:00
parent df73f328f8
commit 2866a604b4
6 changed files with 14 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/divelogexportdialog.cpp
View file

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