python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-24 12:34:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Finish 1.6.7

Browse Source
This commit is contained in:
Alexander Arin 2022-08-23 01:31:24 +03:00
commit f359509a32
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/lrglobal.h
View File

@ -104,7 +104,7 @@ namespace Const{
QString extractClassName(QString className); QString extractClassName(QString className);
QString escapeSimbols(const QString& value); QString escapeSimbols(const QString& value);
QString replaceHTMLSymbols(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<QString> normalizeCaptures(const QRegularExpressionMatch &reg); QVector<QString> normalizeCaptures(const QRegularExpressionMatch &reg);
#else #else
QVector<QString> normalizeCaptures(const QRegExp &reg); QVector<QString> normalizeCaptures(const QRegExp &reg);

6
limereport/items/lrimageitem.cpp
View File

@ -63,7 +63,7 @@ BaseDesignIntf *ImageItem::createSameTypeItem(QObject *owner, QGraphicsItem *par
void ImageItem::loadPictureFromVariant(QVariant& data){ void ImageItem::loadPictureFromVariant(QVariant& data){
//TODO: Migrate to QMetaType //TODO: Migrate to QMetaType
if (data.isValid()){ 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){ if (data.typeId() == QMetaType::QImage){
#else #else
if (data.type() == QVariant::Image){ if (data.type() == QVariant::Image){
@ -185,14 +185,14 @@ void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass,
} else if (!m_variable.isEmpty()){ } else if (!m_variable.isEmpty()){
//TODO: Migrate to QMetaType //TODO: Migrate to QMetaType
QVariant data = dataManager->variable(m_variable); 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){ if (data.typeId() == QMetaType::QString){
#else #else
if (data.type() == QVariant::String){ if (data.type() == QVariant::String){
#endif #endif
m_picture = QImage(data.toString()); m_picture = QImage(data.toString());
} else { } else {
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
if (data.typeId() == QMetaType::QImage){ if (data.typeId() == QMetaType::QImage){
#else #else
if (data.type() == QVariant::Image){ if (data.type() == QVariant::Image){

2
limereport/lrglobal.h
View File

@ -104,7 +104,7 @@ namespace Const{
QString extractClassName(QString className); QString extractClassName(QString className);
QString escapeSimbols(const QString& value); QString escapeSimbols(const QString& value);
QString replaceHTMLSymbols(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<QString> normalizeCaptures(const QRegularExpressionMatch &reg); QVector<QString> normalizeCaptures(const QRegularExpressionMatch &reg);
#else #else
QVector<QString> normalizeCaptures(const QRegExp &reg); QVector<QString> normalizeCaptures(const QRegExp &reg);

1
limereport/translationeditor/translationeditor.h
View File

@ -4,6 +4,7 @@
#include <QWidget> #include <QWidget>
#include <QLocale> #include <QLocale>
#include <QTreeWidgetItem> #include <QTreeWidgetItem>
#include <QShortcut>
#include "lrreporttranslation.h" #include "lrreporttranslation.h"
namespace LimeReport { namespace LimeReport {