diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:57:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:57:43 +0100 |
| commit | a6ce801018a4254efeab000efa2457317270939b (patch) | |
| tree | 5c48ea39e2a3652016b676f1491991b6a9f2a0d7 /src/imports/location/location.cpp | |
| parent | 48651de4a7a11b7bd348487df6eb68f258ed3c6a (diff) | |
| parent | 5cb6d1bac19bf779afbbd22bbe723e43aa86c1b7 (diff) | |
| download | qtlocation-a6ce801018a4254efeab000efa2457317270939b.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Idf2f674fc45e7ceb4563bc1d86180c3431dfa62f
Diffstat (limited to 'src/imports/location/location.cpp')
| -rw-r--r-- | src/imports/location/location.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 548c796a..f299d153 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -157,11 +157,11 @@ public: // Implicitly registers 5.3 & 5.4 minor = 5; - //TODO: this is broken QTBUG-40043 + //TODO: this is broken QTBUG-50990 qmlRegisterUncreatableType<QDeclarativeGeoMapType, 1>(uri, major, minor, "MapType", QStringLiteral("MapType is not intended instantiable by developer.")); minor = 6; - //TODO: this is broken QTBUG-40043 + //TODO: this is broken QTBUG-50990 qmlRegisterUncreatableType<QQuickGeoMapGestureArea, 1>(uri, major, minor, "MapGestureArea", QStringLiteral("(Map)GestureArea is not intended instantiable by developer.")); |