From b311b4b195398c26336180385cf85701616fe1bf Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Thu, 6 Nov 2014 15:22:30 +0000 Subject: [PATCH] Fix regression occurred in rev 3439 git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3458 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetgraphicsitem/element.h | 6 ++++++ sources/qetproject.cpp | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/sources/qetgraphicsitem/element.h b/sources/qetgraphicsitem/element.h index 16ccbabf5..6757dc039 100644 --- a/sources/qetgraphicsitem/element.h +++ b/sources/qetgraphicsitem/element.h @@ -108,7 +108,13 @@ class Element : public QetGraphicsItem { virtual void linkToElement(Element *) {} virtual void unlinkAllElements() {} virtual void unlinkElement(Element *) {} + +#if QT_VERSION >= 0x040800 virtual void initLink(QETProject *); +#else + void initLink(QETProject *); +#endif + QList linkedElements (); virtual int linkType() const {return link_type_;} // @return the linkable type void newUuid() {uuid_ = QUuid::createUuid();} //create new uuid for this element diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp index 28f250610..9e2e68ed1 100644 --- a/sources/qetproject.cpp +++ b/sources/qetproject.cpp @@ -458,7 +458,11 @@ void QETProject::setDefaultXRefProperties(const QString type, const XRefProperti } void QETProject::setDefaultXRefProperties(QHash hash) { +#if QT_VERSION >= 0x040800 + m_default_xref_properties.swap(hash); +#else m_default_xref_properties = hash; +#endif emit XRefPropertiesChanged(); }