Merge branch 'master' into 1.4

This commit is contained in:
Arin Alexander
2016-11-01 14:56:18 +03:00
9 changed files with 75 additions and 20 deletions

View File

@@ -97,7 +97,7 @@ namespace LimeReport{
#endif
private:
bool m_valid;
void invalidate(){m_object=0; m_valid = false; m_name = ""; m_value=QVariant(), m_isClass=false;}
void invalidate(){m_object=0; m_objects=0; m_valid = false; m_name = ""; m_value=QVariant(), m_isClass=false;}
protected:
void beginChangeValue(){ m_changingValue = true; }