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

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alex
2016-07-07 23:52:51 +03:00
parent 826e62abe0 885cd91daa
commit 9243036750
17 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
limereport/objectinspector/lrobjectpropitem.h
View File

@@ -36,7 +36,6 @@
#include <QMetaProperty>
#include <QAbstractItemModel>
#include <QDebug>
#include <QStyleOptionViewItemV4>
#include "lrattribsabstractfactory.h"
#include "lrsingleton.h"
@@ -70,7 +69,7 @@ namespace LimeReport{
virtual void setModelData(QWidget * /*editor*/, QAbstractItemModel * /*model*/, const QModelIndex &/*index*/){}
virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/*index*/) const;
virtual void updatePropertyValue();
virtual bool paint(QPainter *, const QStyleOptionViewItemV4 &, const QModelIndex &);
virtual bool paint(QPainter *, const StyleOptionViewItem &, const QModelIndex &);
ObjectPropItem* parent() const{ return m_parent;}
QObject* object() const{return m_object;}