summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2022-05-16 18:16:42 +0300
committerTarja Sundqvist <tarja.sundqvist@qt.io>2022-05-16 18:16:42 +0300
commitddf3f88156369671576a9bcc703feb22e7b7ff0d (patch)
tree73a88d86a4b4275da1c7c3544ddda9d3b2aea5b6 /src
parentc4d3a00345e99cfc2e137d457c89d979f9e0c348 (diff)
parentcc1f53102d3bf7df4e7f6da3348a704cfd309ee7 (diff)
downloadqtlocation-5.15.5-lts-lgpl.tar.gz
Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl
Change-Id: Id7d89a7b8c0fb50bb921eabaa2a4bb3d094378a0
Diffstat (limited to 'src')
-rw-r--r--src/positioningquick/qdeclarativepositionsource.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/positioningquick/qdeclarativepositionsource.cpp b/src/positioningquick/qdeclarativepositionsource.cpp
index cf160541..5d7856ae 100644
--- a/src/positioningquick/qdeclarativepositionsource.cpp
+++ b/src/positioningquick/qdeclarativepositionsource.cpp
@@ -193,6 +193,12 @@ void QDeclarativePositionSource::setName(const QString &newName)
*/
void QDeclarativePositionSource::tryAttach(const QString &newName, bool useFallback)
{
+ if (m_nmeaFile != nullptr || m_nmeaSocket != nullptr) {
+ if (!m_providerName.isEmpty())
+ qWarning("Both nmeaSource and name parameters are specified. nmeaSource will be used.");
+ return;
+ }
+
const QString previousName = name();
const bool sourceExisted = m_positionSource;
m_providerName = newName;