diff --git a/include/lrglobal.h b/include/lrglobal.h index 1286a0d..b2fe56c 100644 --- a/include/lrglobal.h +++ b/include/lrglobal.h @@ -104,7 +104,7 @@ namespace Const{ QString extractClassName(QString className); QString escapeSimbols(const QString& value); QString replaceHTMLSymbols(const QString &value); -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3) +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1) QVector normalizeCaptures(const QRegularExpressionMatch ®); #else QVector normalizeCaptures(const QRegExp ®); diff --git a/limereport/items/lrimageitem.cpp b/limereport/items/lrimageitem.cpp index 8fc3975..0459b67 100644 --- a/limereport/items/lrimageitem.cpp +++ b/limereport/items/lrimageitem.cpp @@ -63,7 +63,7 @@ BaseDesignIntf *ImageItem::createSameTypeItem(QObject *owner, QGraphicsItem *par void ImageItem::loadPictureFromVariant(QVariant& data){ //TODO: Migrate to QMetaType if (data.isValid()){ -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (data.typeId() == QMetaType::QImage){ #else if (data.type() == QVariant::Image){ @@ -185,14 +185,14 @@ void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, } else if (!m_variable.isEmpty()){ //TODO: Migrate to QMetaType QVariant data = dataManager->variable(m_variable); -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (data.typeId() == QMetaType::QString){ #else if (data.type() == QVariant::String){ #endif m_picture = QImage(data.toString()); } else { -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (data.typeId() == QMetaType::QImage){ #else if (data.type() == QVariant::Image){ diff --git a/limereport/lrglobal.h b/limereport/lrglobal.h index 1286a0d..b2fe56c 100644 --- a/limereport/lrglobal.h +++ b/limereport/lrglobal.h @@ -104,7 +104,7 @@ namespace Const{ QString extractClassName(QString className); QString escapeSimbols(const QString& value); QString replaceHTMLSymbols(const QString &value); -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3) +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1) QVector normalizeCaptures(const QRegularExpressionMatch ®); #else QVector normalizeCaptures(const QRegExp ®); diff --git a/limereport/translationeditor/translationeditor.h b/limereport/translationeditor/translationeditor.h index 954bf34..2288b25 100644 --- a/limereport/translationeditor/translationeditor.h +++ b/limereport/translationeditor/translationeditor.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "lrreporttranslation.h" namespace LimeReport {