diff -rupN --no-dereference qgis-3.32.1/cmake/FindQwtPolar.cmake qgis-3.32.1-new/cmake/FindQwtPolar.cmake
--- qgis-3.32.1/cmake/FindQwtPolar.cmake 2023-07-21 14:13:30.000000000 +0200
+++ qgis-3.32.1-new/cmake/FindQwtPolar.cmake 2023-07-26 10:16:59.929335761 +0200
@@ -5,18 +5,18 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
-# Once run this will define:
-#
+# Once run this will define:
+#
# QWTPOLAR_FOUND = system has QwtPolar lib
# QWTPOLAR_LIBRARY = full path to the QwtPolar library
-# QWTPOLAR_INCLUDE_DIR = where to find headers
+# QWTPOLAR_INCLUDE_DIR = where to find headers
#
-FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar PATHS
+FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar qwt-qt5 PATHS
/usr/lib
/usr/local/lib
- "$ENV{LIB_DIR}/lib"
- "$ENV{LIB}/lib"
+ "$ENV{LIB_DIR}/lib"
+ "$ENV{LIB}/lib"
)
SET(_qwtpolar_fw)
@@ -30,7 +30,7 @@ FIND_PATH(QWTPOLAR_INCLUDE_DIR NAMES qwt
/usr/local/include
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"
- PATH_SUFFIXES qwtpolar qwt
+ PATH_SUFFIXES qwtpolar qwt qt5/qwt
)
IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY)
diff -rupN --no-dereference qgis-3.32.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.32.1-new/src/app/gps/qgsgpsinformationwidget.cpp
--- qgis-3.32.1/src/app/gps/qgsgpsinformationwidget.cpp 2023-07-21 14:13:30.000000000 +0200
+++ qgis-3.32.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-07-26 10:16:59.930335761 +0200
@@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS
{
#ifdef WITH_QWTPOLAR
QwtPolarMarker *mypMarker = new QwtPolarMarker();
-#if (QWT_POLAR_VERSION<0x010000)
+#if defined(QWT_POLAR_VERSION) && (QWT_POLAR_VERSION<0x010000)
mypMarker->setPosition( QwtPolarPoint( currentInfo.azimuth, currentInfo.elevation ) );
#else
mypMarker->setPosition( QwtPointPolar( currentInfo.azimuth, currentInfo.elevation ) );
@@ -426,7 +426,7 @@ void QgsGpsInformationWidget::displayGPS
QBrush symbolBrush( Qt::black );
QSize markerSize( 9, 9 );
QBrush textBgBrush( bg );
-#if (QWT_POLAR_VERSION<0x010000)
+#if defined(QWT_POLAR_VERSION) && (QWT_POLAR_VERSION<0x010000)
mypMarker->setSymbol( QwtSymbol( QwtSymbol::Ellipse,
symbolBrush, QPen( myColor ), markerSize ) );
#else