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

Update the Qt4 patch

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-01-25 14:28:21 -08:00
parent ab1d6a7ea0
commit aaa34a1de7
1 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
packaging/ubuntu/0001-Make-build-with-Qt4.patch
View file

@ -1,17 +1,17 @@
From 5bb7449724646df61cef72a4cee25e786c067cd2 Mon Sep 17 00:00:00 2001 From 82dccbcff56fc32775dc715cecd7e1fc359d08aa Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org> From: Dirk Hohndel <dirk@hohndel.org>
Date: Sat, 17 Jan 2015 12:44:05 +1300 Date: Sun, 25 Jan 2015 14:26:25 -0800
Subject: [PATCH] Make build with Qt4 Subject: [PATCH] Make build with Qt4
Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
--- ---
qt-ui/divelogimportdialog.cpp | 26 ++++++++++++++++++++++++++ qt-ui/divelogimportdialog.cpp | 30 ++++++++++++++++++++++++++++++
qt-ui/downloadfromdivecomputer.cpp | 12 ++++++++++++ qt-ui/downloadfromdivecomputer.cpp | 12 ++++++++++++
qt-ui/plannerSettings.ui | 4 ++-- qt-ui/plannerSettings.ui | 4 ++--
3 files changed, 40 insertions(+), 2 deletions(-) 3 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
index 08e5dd110104..a528b56bdff0 100644 index 1b37258b2a47..114b275d985d 100644
--- a/qt-ui/divelogimportdialog.cpp --- a/qt-ui/divelogimportdialog.cpp
+++ b/qt-ui/divelogimportdialog.cpp +++ b/qt-ui/divelogimportdialog.cpp
@@ -375,14 +375,22 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) @@ -375,14 +375,22 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
@ -36,8 +36,20 @@ index 08e5dd110104..a528b56bdff0 100644
+#endif +#endif
blockSignals(false); blockSignals(false);
} }
QString separator = ui->CSVSeparator->currentText() == tr("Tab") ? "\t" : ui->CSVSeparator->currentText();
@@ -400,7 +408,16 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) @@ -390,7 +398,11 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
if (triggeredBy == KNOWNTYPES && value == 1) {
firstLine = "Sample time\tSample depth\t\t\t\t\tSample pO₂\t\t\t\t\t\t\t\t\tSample temperature\t\tSample cns\tSample stopdepth";
blockSignals(true);
+#if QT_VERSION >= 0x050000
ui->CSVSeparator->setCurrentText(tr("Tab"));
+#else
+ us->CSVSeparator->setCurrentIndex(0);
+#endif
blockSignals(false);
}
@@ -409,7 +421,16 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
separator = ";"; separator = ";";
if (ui->CSVSeparator->currentText() != separator) { if (ui->CSVSeparator->currentText() != separator) {
blockSignals(true); blockSignals(true);
@ -54,10 +66,10 @@ index 08e5dd110104..a528b56bdff0 100644
blockSignals(false); blockSignals(false);
currColumns = firstLine.split(separator); currColumns = firstLine.split(separator);
} }
@@ -434,7 +451,16 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) @@ -460,7 +481,16 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
separator = CSVApps[value].separator;
if (ui->CSVSeparator->currentText() != separator) { if (ui->CSVSeparator->currentText() != separator || separator == "Tab") {
blockSignals(true); ui->CSVSeparator->blockSignals(true);
+#if QT_VERSION >= 0x050000 +#if QT_VERSION >= 0x050000
ui->CSVSeparator->setCurrentText(separator); ui->CSVSeparator->setCurrentText(separator);
+#else +#else
@ -68,7 +80,7 @@ index 08e5dd110104..a528b56bdff0 100644
+ else + else
+ ui->CSVSeparator->setCurrentIndex(2); + ui->CSVSeparator->setCurrentIndex(2);
+#endif +#endif
blockSignals(false); ui->CSVSeparator->blockSignals(false);
if (separator == "Tab") if (separator == "Tab")
separator = "\t"; separator = "\t";
diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp