From 3802257ab32f62e2491053428145f3ab578d312a Mon Sep 17 00:00:00 2001
From: Jose Pablo Castro Valverde <josep.castro@softtek.com>
Date: Tue, 22 Sep 2015 23:51:54 -0600
Subject: [PATCH] Make openhantek compile with Qt5 (drop Qt4 support)

---
 openhantek/OpenHantek.pro    | 1 +
 openhantek/src/dsowidget.cpp | 3 +--
 openhantek/src/exporter.cpp  | 2 +-
 openhantek/src/exporter.h    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openhantek/OpenHantek.pro b/openhantek/OpenHantek.pro
index a83f06e..8058b78 100644
--- a/openhantek/OpenHantek.pro
+++ b/openhantek/OpenHantek.pro
@@ -17,6 +17,7 @@ CONFIG += \
 	warn_on \
 	qt
 QT += opengl
+QT += printsupport
 LIBS += -lfftw3
 
 # Source files
diff --git a/openhantek/src/dsowidget.cpp b/openhantek/src/dsowidget.cpp
index 35d54d7..051c09d 100644
--- a/openhantek/src/dsowidget.cpp
+++ b/openhantek/src/dsowidget.cpp
@@ -445,7 +445,6 @@ bool DsoWidget::exportAs() {
 	QStringList filters;
 	filters
 			<< tr("Portable Document Format (*.pdf)")
-			<< tr("PostScript (*.ps)")
 			<< tr("Image (*.png *.xpm *.jpg)")
 			<< tr("Comma-Separated Values (*.csv)");
 	
@@ -457,7 +456,7 @@ bool DsoWidget::exportAs() {
 	
 	Exporter exporter(this->settings, this->dataAnalyzer, static_cast<QWidget *>(this->parent()));
 	exporter.setFilename(fileDialog.selectedFiles().first());
-	exporter.setFormat((ExportFormat) (EXPORT_FORMAT_PDF + filters.indexOf(fileDialog.selectedFilter())));
+    exporter.setFormat((ExportFormat) (EXPORT_FORMAT_PDF + filters.indexOf(fileDialog.selectedNameFilter())));
 	
 	return exporter.doExport();
 }
diff --git a/openhantek/src/exporter.cpp b/openhantek/src/exporter.cpp
index 2631f6d..a0f8b60 100644
--- a/openhantek/src/exporter.cpp
+++ b/openhantek/src/exporter.cpp
@@ -99,7 +99,7 @@ bool Exporter::doExport() {
 			else {
 				// Configure the QPrinter
 				static_cast<QPrinter *>(paintDevice)->setOutputFileName(this->filename);
-				static_cast<QPrinter *>(paintDevice)->setOutputFormat((this->format == EXPORT_FORMAT_PDF) ? QPrinter::PdfFormat : QPrinter::PostScriptFormat);
+                static_cast<QPrinter *>(paintDevice)->setOutputFormat((this->format == EXPORT_FORMAT_PDF) ? QPrinter::PdfFormat : QPrinter::NativeFormat);
 			}
 		}
 		else {
diff --git a/openhantek/src/exporter.h b/openhantek/src/exporter.h
index e6fd22d..725ab1b 100644
--- a/openhantek/src/exporter.h
+++ b/openhantek/src/exporter.h
@@ -40,7 +40,7 @@ class DataAnalyzer;
 /// \brief Possible file formats for the export.
 enum ExportFormat {
 	EXPORT_FORMAT_PRINTER,
-	EXPORT_FORMAT_PDF, EXPORT_FORMAT_PS,
+    EXPORT_FORMAT_PDF,
 	EXPORT_FORMAT_IMAGE,
 	EXPORT_FORMAT_CSV
 };
--
libgit2 0.21.4