From 2ec93af5413ccd84f31c376f6da9c1f46a90dea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Tue, 16 Apr 2019 20:12:00 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@529 a8b55f48-bf90-11e4-a774-851b48703e85 --- piqt/piqt.cpp | 6 +++++- piqt/piqt.h | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/piqt/piqt.cpp b/piqt/piqt.cpp index bf45d1a..76e14c8 100644 --- a/piqt/piqt.cpp +++ b/piqt/piqt.cpp @@ -1,6 +1,8 @@ #include "piqt.h" #include "qvariantedit.h" -#include +#if QT_VERSION >= 0x050200 +# include +#endif const QAD::Enum PI2QADEnum(const PIVariantTypes::Enum & el) { @@ -123,6 +125,7 @@ const PIVariantTypes::Dir QAD2PIDir(const QAD::Dir & v) { } +#if QT_VERSION >= 0x050200 const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v) { PIGeoPosition p(v); p.transformTo(PIGeoPosition::Cartesian); @@ -135,3 +138,4 @@ const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v) { const PIGeoPosition Q2PIGeoPosition(const QGeoCoordinate & v) { return PIGeoPosition(createVectorT3d(v.latitude(), v.longitude(), v.altitude()), PIGeoPosition::Geodetic); } +#endif diff --git a/piqt/piqt.h b/piqt/piqt.h index 56d9cdb..1960a9c 100644 --- a/piqt/piqt.h +++ b/piqt/piqt.h @@ -3,11 +3,13 @@ #include "pimathmatrix.h" #include "pipropertystorage.h" -#include "pigeoposition.h" #include "qad_types.h" #include #include #include +#if QT_VERSION >= 0x050200 +# include "pigeoposition.h" +#endif class QGeoCoordinate; @@ -114,8 +116,10 @@ const PIVariantTypes::IODevice QAD2PIIODevice(const QAD::IODevice & v); //inline const PIVariant QString2PIVariant(const QString & v) {return PIVariant::readFromString(QString2PIString(v));} +#if QT_VERSION >= 0x050200 const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v); const PIGeoPosition Q2PIGeoPosition(const QGeoCoordinate & v); +#endif template class __PIQtConverter {