File 0001-Fix-compilation-with-recent-Qt-versions.patch of Package sdrangelove

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-compilation-with-recent-Qt-versions.patch of Package sdrangelove (Revision f86d7547cdbdae64191ec57e97c309ec)

Currently displaying revision f86d7547cdbdae64191ec57e97c309ec , Show latest

From 4eb50195f848e2ffa939fa55d026386bf5340b3c Mon Sep 17 00:00:00 2001
From: Martin Hauke <mardnh@gmx.de>
Date: Sun, 20 Sep 2020 14:01:25 +0200
Subject: [PATCH] Fix compilation with recent Qt versions

* Add missing include <QPainterPath> needed for Qt >= 5.15
* Fix QString::null deprecated declarations
---
 include/util/simpleserializer.h | 2 +-
 sdrbase/gui/rollupwidget.cpp    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/util/simpleserializer.h b/include/util/simpleserializer.h
index 1388aa5..e9ef13b 100644
--- a/include/util/simpleserializer.h
+++ b/include/util/simpleserializer.h
@@ -60,7 +60,7 @@ public:
 	bool readDouble(quint32 id, double* result, double def = 0) const;
 	bool readReal(quint32 id, Real* result, Real def = 0) const;
 	bool readBool(quint32 id, bool* result, bool def = false) const;
-	bool readString(quint32 id, QString* result, const QString& def = QString::null) const;
+	bool readString(quint32 id, QString* result, const QString& def = QString()) const;
 	bool readBlob(quint32 id, QByteArray* result, const QByteArray& def = QByteArray()) const;
 
 	bool isValid() const { return m_valid; }
diff --git a/sdrbase/gui/rollupwidget.cpp b/sdrbase/gui/rollupwidget.cpp
index dafe315..0a91b4e 100644
--- a/sdrbase/gui/rollupwidget.cpp
+++ b/sdrbase/gui/rollupwidget.cpp
@@ -1,5 +1,6 @@
 #include <QEvent>
 #include <QPainter>
+#include <QPainterPath>
 #include <QMouseEvent>
 #include "gui/rollupwidget.h"
 #include "ui_glspectrumgui.h"
-- 
2.26.2

Places

File 0001-Fix-compilation-with-recent-Qt-versions.patch of Package sdrangelove (Revision f86d7547cdbdae64191ec57e97c309ec)

Places