python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-02 03:53:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alexander
2016-10-19 01:26:52 +03:00
parent 2152c3f4f1 2768d13301
commit 503329bca2
5 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
limereport/objectinspector/lrobjectpropitem.h
View File

@@ -73,7 +73,7 @@ namespace LimeReport{
ObjectPropItem* parent() const{ return m_parent;}
QObject* object() const{return m_object;}
ObjectsList* objects() {return &m_objects;}
ObjectsList* objects() {return m_objects;}
ObjectPropItem* child(int row);
QList<ObjectPropItem*> children(){return m_childItems;}
ObjectPropItem* findChild(const QString& propertyName);
@@ -106,7 +106,7 @@ namespace LimeReport{
void setValueToObject(const QString& propertyName, QVariant propertyValue);
private:
QObject* m_object;
ObjectsList m_objects;
ObjectsList* m_objects;
QString m_name;
QString m_displayName;
QVariant m_value;