diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-16 18:16:42 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-16 18:16:42 +0300 |
| commit | ddf3f88156369671576a9bcc703feb22e7b7ff0d (patch) | |
| tree | 73a88d86a4b4275da1c7c3544ddda9d3b2aea5b6 | |
| parent | c4d3a00345e99cfc2e137d457c89d979f9e0c348 (diff) | |
| parent | cc1f53102d3bf7df4e7f6da3348a704cfd309ee7 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl
Change-Id: Id7d89a7b8c0fb50bb921eabaa2a4bb3d094378a0
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/positioningquick/qdeclarativepositionsource.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 398f6638..062d6124 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,7 +3,7 @@ CONFIG += warning_clean DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.4 +MODULE_VERSION = 5.15.5 # Adds a way to debug location. The define is needed for multiple subprojects as they # include the essential headers. 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; |