Commit 2282051c authored by Vyacheslav Koscheev's avatar Vyacheslav Koscheev

[cmake] fix QGeoPositionInfo metatype redefinition

parent eeb976fb
...@@ -36,13 +36,17 @@ ...@@ -36,13 +36,17 @@
#include "QGeoPositionInfoSourceAndroidGms.h" #include "QGeoPositionInfoSourceAndroidGms.h"
#include <QtCore/qtcoreversion.h>
#include <QtPositioning/QGeoPositionInfo> #include <QtPositioning/QGeoPositionInfo>
#include <QJniHelpers/QAndroidQPAPluginGap.h> #include <QJniHelpers/QAndroidQPAPluginGap.h>
#include "QAndroidGmsLocationProvider.h" #include "QAndroidGmsLocationProvider.h"
#include "QLocationManagerProvidersListener.h" #include "QLocationManagerProvidersListener.h"
Q_DECLARE_METATYPE(QGeoPositionInfo) #if QTCORE_VERSION < 0x050C00
Q_DECLARE_METATYPE(QGeoPositionInfo)
#endif
/*! /*!
......
...@@ -37,13 +37,16 @@ ...@@ -37,13 +37,16 @@
#include "QGeoPositionInfoSourceAndroidPassive.h" #include "QGeoPositionInfoSourceAndroidPassive.h"
#include <QtCore/qtcoreversion.h>
#include <QtPositioning/QGeoPositionInfo> #include <QtPositioning/QGeoPositionInfo>
#include <QJniHelpers/TJniObjectLinker.h> #include <QJniHelpers/TJniObjectLinker.h>
#include "PositionInfoConvertor.h" #include "PositionInfoConvertor.h"
Q_DECLARE_METATYPE(QGeoPositionInfo) #if QTCORE_VERSION < 0x050C00
Q_DECLARE_METATYPE(QGeoPositionInfo)
#endif
static const char * const c_full_class_name_ = "ru/dublgis/androidlocation/PassiveLocationProvider"; static const char * const c_full_class_name_ = "ru/dublgis/androidlocation/PassiveLocationProvider";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment