Port gps support to QSerialPort (byebye QExtSerialPort)

qgis · Jun 28, 2018 · 212cffc · 212cffc
1 parent 30ddbbf
commit 212cffc
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 3,381 deletions.
diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -45,6 +45,7 @@ RUN  apt-get update \
     libqt5webkit5-dev \
     libqt5xml5 \
     libqt5xmlpatterns5-dev \
+    libqt5serialport5-dev \
     libqwt-qt5-dev \
     libspatialindex-dev \
     libspatialite-dev \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,8 +111,6 @@ IF(WITH_CORE)
     SET (POSTGRESQL_PREFIX "" CACHE PATH "Path to POSTGRESQL base directory")
   ENDIF (WITH_POSTGRESQL)
 
-  SET (WITH_INTERNAL_QEXTSERIALPORT TRUE CACHE BOOL "Use internal build of Qextserialport")
-
   SET (WITH_QSPATIALITE FALSE CACHE BOOL "Determines whether QSPATIALITE sql driver should be built")
 
   SET (WITH_ORACLE FALSE CACHE BOOL "Determines whether Oracle support should be built")
@@ -252,12 +250,6 @@ IF(WITH_CORE)
   ENDIF (WITH_GUI)
   FIND_PACKAGE(LibZip REQUIRED)
 
-  IF (WITH_INTERNAL_QEXTSERIALPORT)
-    SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/qextserialport)
-  ELSE (WITH_INTERNAL_QEXTSERIALPORT)
-    FIND_PACKAGE(Qextserialport REQUIRED)
-  ENDIF(WITH_INTERNAL_QEXTSERIALPORT)
-
   FIND_PACKAGE(Sqlite3)
   IF (NOT SQLITE3_FOUND)
     MESSAGE (SEND_ERROR "sqlite3 dependency was not found!")
@@ -308,6 +300,7 @@ IF(WITH_CORE)
   FIND_PACKAGE(Qt5Svg REQUIRED)
   FIND_PACKAGE(Qt5Concurrent REQUIRED)
   FIND_PACKAGE(Qt5PrintSupport REQUIRED)
+  FIND_PACKAGE(Qt5SerialPort REQUIRED)
   FIND_PACKAGE(Qt5Positioning)
   IF (WITH_QTWEBKIT)
     FIND_PACKAGE(Qt5WebKit REQUIRED)

diff --git a/cmake/FindQextserialport.cmake b/cmake/FindQextserialport.cmake
diff --git a/debian/control.in b/debian/control.in
@@ -22,7 +22,7 @@ Build-Depends:
  libspatialindex-dev,
  libzip-dev,
  qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev, qt5keychain-dev,
- libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5scintilla2-dev,
+ libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5serialport5-dev, libqt5scintilla2-dev,
  libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins,
  python3-dev, python3-all-dev, python3-sip, python3-sip-dev,
  pyqt5-dev-tools, pyqt5-dev, pyqt5.qsci-dev,