diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 11:06:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 11:06:28 +0200 |
| commit | f55629245259ba7364e258f92408823024423caa (patch) | |
| tree | f73063cf02dc175fbe9f0bfb48b3ddd686ea0f72 /src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp | |
| parent | 22d980c8124026eb712f563326d5a5c1b180c671 (diff) | |
| parent | d89701c5c8646dedb0ebb2e011c4da796a6ae8a1 (diff) | |
| download | qtlocation-f55629245259ba7364e258f92408823024423caa.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/plugins/geoservices/geoservices.pro
Change-Id: Ie82dd22c588e5cba409fc1ef31a65968ce9f719b
Diffstat (limited to 'src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp')
| -rw-r--r-- | src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp index d832ff40..780eb98a 100644 --- a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp +++ b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp @@ -38,7 +38,7 @@ #include "qdeclarativesupportedcategoriesmodel_p.h" #include "qdeclarativeplaceicon_p.h" #include "qgeoserviceprovider.h" -#include "error_messages.h" +#include "error_messages_p.h" #include <QCoreApplication> #include <QtQml/QQmlInfo> |