QtLocationPlugin: Link SQL Privately

mavlink · Sep 20, 2024 · 9c0d3e1 · 9c0d3e1
1 parent 8ad91d9
commit 9c0d3e1
Show file tree

Hide file tree

Showing 4 changed files with 181 additions and 203 deletions.
diff --git a/src/QtLocationPlugin/CMakeLists.txt b/src/QtLocationPlugin/CMakeLists.txt
@@ -52,6 +52,7 @@ endif()
 target_link_libraries(QGCLocation
     PRIVATE
         Qt6::Positioning
+        Qt6::Sql
         QGC
         Settings
         Utilities
@@ -60,7 +61,6 @@ target_link_libraries(QGCLocation
         Qt6::Location
         Qt6::LocationPrivate
         Qt6::Network
-        Qt6::Sql
         QmlControls
 )
 

diff --git a/src/QtLocationPlugin/QGCMapEngine.cpp b/src/QtLocationPlugin/QGCMapEngine.cpp
@@ -66,7 +66,7 @@ QGCMapEngine::QGCMapEngine(QObject *parent)
 QGCMapEngine::~QGCMapEngine()
 {
     (void) disconnect(m_worker);
-    m_worker->quit();
+    m_worker->stop();
     m_worker->wait();
 
     // qCDebug(QGCMapEngineLog) << Q_FUNC_INFO << this;