Changeset 82f216f in subsurface


Ignore:
Timestamp:
Jan 31, 2015, 1:35:32 PM (3 years ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
Mtest, android_test, dcDownload, foratdotde, gitMerge, gitdebug, gitpictures, ios, master, mergeKirigamiPort, pictimeshift, resolutionIndependence, spinner, testTomaz, testing, v4.4-branch, v4.5-branch
Children:
c70ba77
Parents:
eeb0c6a
Message:

Once again update the Qt4 patch for Ubuntu 12.04 build

Signed-off-by: Dirk Hohndel <dirk@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packaging/ubuntu/0001-Make-build-with-Qt4.patch

    redc2d40 r82f216f  
    1 From 6c59f4c0fa925d1254668390f32229da93b44c75 Mon Sep 17 00:00:00 2001
     1From f4637480501bb82884b719624d8d179b5d3016c2 Mon Sep 17 00:00:00 2001
    22From: Dirk Hohndel <dirk@hohndel.org>
    33Date: Wed, 28 Jan 2015 14:42:12 -0800
     
    55
    66Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
    7 
    8 Conflicts:
    9         qt-ui/downloadfromdivecomputer.cpp
    107---
     8 qt-ui/divelogexportdialog.cpp      |  7 ++++++-
     9 qt-ui/divelogexportdialog.h        |  4 ++++
    1110 qt-ui/divelogimportdialog.cpp      | 30 ++++++++++++++++++++++++++++++
    1211 qt-ui/downloadfromdivecomputer.cpp | 12 ++++++++++++
    1312 qt-ui/plannerSettings.ui           |  4 ++--
    14  3 files changed, 44 insertions(+), 2 deletions(-)
     13 5 files changed, 54 insertions(+), 3 deletions(-)
    1514
     15diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp
     16index aff0265de616..24ac2942ac36 100644
     17--- a/qt-ui/divelogexportdialog.cpp
     18+++ b/qt-ui/divelogexportdialog.cpp
     19@@ -1,8 +1,9 @@
     20 #include <QFileDialog>
     21 #include <QShortcut>
     22 #include <QSettings>
     23+#if QT_VERSION >= 0x050000
     24 #include <QtConcurrent>
     25-
     26+#endif
     27 #include "divelogexportdialog.h"
     28 #include "diveshareexportdialog.h"
     29 #include "ui_divelogexportdialog.h"
     30@@ -311,7 +312,11 @@ void DiveLogExportDialog::on_buttonBox_accepted()
     31                settings.endGroup();
     32                // the non XSLT exports are called directly above, the XSLT based ons are called here
     33                if (!stylesheet.isEmpty())
     34+#if QT_VERSION >= 0x050000
     35                        future = QtConcurrent::run(export_dives_xslt, filename.toUtf8(), ui->exportSelected->isChecked(), ui->CSVUnits_2->currentIndex(), stylesheet.toUtf8());
     36+#else
     37+                       export_dives_xslt(filename.toUtf8(), ui->exportSelected->isChecked(), ui->CSVUnits_2->currentIndex(), stylesheet.toUtf8());
     38+#endif
     39        }
     40 }
     41 
     42diff --git a/qt-ui/divelogexportdialog.h b/qt-ui/divelogexportdialog.h
     43index 14f8f453980f..524416414a8e 100644
     44--- a/qt-ui/divelogexportdialog.h
     45+++ b/qt-ui/divelogexportdialog.h
     46@@ -3,7 +3,9 @@
     47 
     48 #include <QDialog>
     49 #include <QTextStream>
     50+#if QT_VERSION >= 0x050000
     51 #include <QFuture>
     52+#endif
     53 #include "helpers.h"
     54 #include "statistics.h"
     55 
     56@@ -28,7 +30,9 @@ slots:
     57        void on_exportGroup_buttonClicked(QAbstractButton *);
     58 
     59 private:
     60+#if QT_VERSION >= 0x050000
     61        QFuture<int> future;
     62+#endif
     63        Ui::DiveLogExportDialog *ui;
     64        void showExplanation();
     65        void exportHtmlInit(const QString &filename);
    1666diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
    17 index 5cda9036eb94..57648e081050 100644
     67index c79b9df953eb..25fd75d15d0e 100644
    1868--- a/qt-ui/divelogimportdialog.cpp
    1969+++ b/qt-ui/divelogimportdialog.cpp
Note: See TracChangeset for help on using the changeset viewer.