diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 13:55:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 13:55:33 +0100 |
| commit | ff30e9bf29354be55a26e30ea346bb3c709617bf (patch) | |
| tree | 96b24770ae90014608cead838caf28a3fe334afe /src/imports/positioning | |
| parent | 648bde7a3a122297f0a159a511fc7e3fda22940c (diff) | |
| parent | df901e5f2dc5570506a8a0477fe3969c503f400c (diff) | |
| download | qtlocation-ff30e9bf29354be55a26e30ea346bb3c709617bf.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I13d7ceaae445a4f2d006031b870bd8b29a900e30
Diffstat (limited to 'src/imports/positioning')
| -rw-r--r-- | src/imports/positioning/qdeclarativepositionsource.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp index 26b67895..a770e664 100644 --- a/src/imports/positioning/qdeclarativepositionsource.cpp +++ b/src/imports/positioning/qdeclarativepositionsource.cpp @@ -240,6 +240,8 @@ void QDeclarativePositionSource::setNmeaSource(const QUrl &nmeaSource) localFileName.remove(0, 7); } else if (localFileName.startsWith("file:///")) { localFileName.remove(0, 7); + } else if (localFileName.startsWith("qrc:/")) { + localFileName.remove(0, 5); } if (!QFile::exists(localFileName) && localFileName.startsWith("/")) { localFileName.remove(0,1); |