mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 16:44:39 +03:00
Qt4 build has been fixed
This commit is contained in:
parent
39c3e4185d
commit
fa795fe3ab
@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
|||||||
|
|
||||||
LIMEREPORT_VERSION_MAJOR = 1
|
LIMEREPORT_VERSION_MAJOR = 1
|
||||||
LIMEREPORT_VERSION_MINOR = 5
|
LIMEREPORT_VERSION_MINOR = 5
|
||||||
LIMEREPORT_VERSION_RELEASE = 7
|
LIMEREPORT_VERSION_RELEASE = 9
|
||||||
|
|
||||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||||
|
@ -262,7 +262,7 @@ public:
|
|||||||
|
|
||||||
QString itemTypeName() const;
|
QString itemTypeName() const;
|
||||||
void setItemTypeName(const QString &itemTypeName);
|
void setItemTypeName(const QString &itemTypeName);
|
||||||
void emitObjectNamePropertyChanged(const QString& oldName, const QString& newName);
|
|
||||||
int borderLineSize() const;
|
int borderLineSize() const;
|
||||||
void setBorderLineSize(int value);
|
void setBorderLineSize(int value);
|
||||||
void showEditorDialog();
|
void showEditorDialog();
|
||||||
@ -303,7 +303,9 @@ public:
|
|||||||
|
|
||||||
bool fillTransparentInDesignMode() const;
|
bool fillTransparentInDesignMode() const;
|
||||||
void setFillTransparentInDesignMode(bool fillTransparentInDesignMode);
|
void setFillTransparentInDesignMode(bool fillTransparentInDesignMode);
|
||||||
|
|
||||||
void emitPosChanged(QPointF oldPos, QPointF newPos);
|
void emitPosChanged(QPointF oldPos, QPointF newPos);
|
||||||
|
void emitObjectNamePropertyChanged(const QString& oldName, const QString& newName);
|
||||||
|
|
||||||
bool isGeometryLocked() const;
|
bool isGeometryLocked() const;
|
||||||
void setGeometryLocked(bool itemLocked);
|
void setGeometryLocked(bool itemLocked);
|
||||||
|
@ -2136,7 +2136,7 @@ bool PosChangedCommand::doIt()
|
|||||||
if (reportItem && (reportItem->pos() != m_newPos[i].pos)){
|
if (reportItem && (reportItem->pos() != m_newPos[i].pos)){
|
||||||
QPointF oldValue = reportItem->pos();
|
QPointF oldValue = reportItem->pos();
|
||||||
reportItem->setPos(m_newPos[i].pos);
|
reportItem->setPos(m_newPos[i].pos);
|
||||||
emit reportItem->posChanged(reportItem, oldValue, reportItem->pos());
|
reportItem->emitPosChanged(oldValue, reportItem->pos());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user