conditional definition of QSerialPort settings

qgis · Jan 25, 2023 · e3a0299 · e3a0299
1 parent 0b9c447
commit e3a0299
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/core/gps/qgsgpsdetector.cpp b/src/core/gps/qgsgpsdetector.cpp
@@ -23,12 +23,12 @@
 #include "qgssettings.h"
 #include "qgssettingsentryenumflag.h"
 
-
+#if defined( HAVE_QT5SERIALPORT )
 const QgsSettingsEntryEnumFlag<QSerialPort::FlowControl> *QgsGpsDetector::settingsGpsFlowControl = new QgsSettingsEntryEnumFlag<QSerialPort::FlowControl>( QStringLiteral( "flow-control" ), QgsSettings::sTreeGps, QSerialPort::NoFlowControl );
 const QgsSettingsEntryEnumFlag<QSerialPort::StopBits> *QgsGpsDetector::settingsGpsStopBits = new QgsSettingsEntryEnumFlag<QSerialPort::StopBits>( QStringLiteral( "stop-bits" ), QgsSettings::sTreeGps, QSerialPort::OneStop );
 const QgsSettingsEntryEnumFlag<QSerialPort::DataBits> *QgsGpsDetector::settingsGpsDataBits = new QgsSettingsEntryEnumFlag<QSerialPort::DataBits>( QStringLiteral( "data-bits" ), QgsSettings::sTreeGps, QSerialPort::Data8 );
 const QgsSettingsEntryEnumFlag<QSerialPort::Parity> *QgsGpsDetector::settingsGpsParity = new QgsSettingsEntryEnumFlag<QSerialPort::Parity>( QStringLiteral( "parity" ), QgsSettings::sTreeGps, QSerialPort::NoParity );
-
+#endif
 
 
 #if defined(QT_POSITIONING_LIB)

diff --git a/src/core/gps/qgsgpsdetector.h b/src/core/gps/qgsgpsdetector.h
@@ -21,7 +21,9 @@
 #include <QObject>
 #include <QList>
 #include <QPair>
+#if defined( HAVE_QT5SERIALPORT )
 #include <QSerialPort>
+#endif
 #include <memory>
 
 #include "qgis_core.h"
@@ -45,10 +47,12 @@ class CORE_EXPORT QgsGpsDetector : public QObject
   public:
     QgsGpsDetector( const QString &portName );
 
+#if defined( HAVE_QT5SERIALPORT )
     static const QgsSettingsEntryEnumFlag<QSerialPort::StopBits> *settingsGpsStopBits SIP_SKIP;
     static const QgsSettingsEntryEnumFlag<QSerialPort::DataBits> *settingsGpsDataBits SIP_SKIP;
     static const QgsSettingsEntryEnumFlag<QSerialPort::Parity> *settingsGpsParity SIP_SKIP;
     static const QgsSettingsEntryEnumFlag<QSerialPort::FlowControl> *settingsGpsFlowControl SIP_SKIP;
+#endif
 
     ~QgsGpsDetector() override;