Finish 1.4.71

# Conflicts:
#	limereport/objectinspector/lrobjectitemmodel.cpp
This commit is contained in:
Arin Alex
2018-03-22 20:38:16 +03:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -96,7 +96,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 70 LIMEREPORT_VERSION_RELEASE = 71
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}\\\"
@@ -147,6 +147,7 @@ void QObjectPropertyModel::translatePropertyName()
tr("legendAlign"); tr("legendAlign");
tr("series"); tr("series");
tr("titleAlign"); tr("titleAlign");
tr("watermark");
} }
void QObjectPropertyModel::clearObjectsList() void QObjectPropertyModel::clearObjectsList()