[qet] [3458] Fix regression occurred in rev 3439

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 3458
Author:   scorpio810
Date:     2014-11-06 16:22:30 +0100 (Thu, 06 Nov 2014)
Log Message:
-----------
Fix regression occurred in rev 3439

Modified Paths:
--------------
    trunk/sources/qetgraphicsitem/element.h
    trunk/sources/qetproject.cpp

Modified: trunk/sources/qetgraphicsitem/element.h
===================================================================
--- trunk/sources/qetgraphicsitem/element.h	2014-11-06 10:46:14 UTC (rev 3457)
+++ trunk/sources/qetgraphicsitem/element.h	2014-11-06 15:22:30 UTC (rev 3458)
@@ -108,7 +108,13 @@
 	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<Element *> linkedElements ();
 	virtual int linkType() const {return link_type_;} // @return the linkable type
 	void newUuid() {uuid_ = QUuid::createUuid();} 	//create new uuid for this element

Modified: trunk/sources/qetproject.cpp
===================================================================
--- trunk/sources/qetproject.cpp	2014-11-06 10:46:14 UTC (rev 3457)
+++ trunk/sources/qetproject.cpp	2014-11-06 15:22:30 UTC (rev 3458)
@@ -458,7 +458,11 @@
 }
 
 void QETProject::setDefaultXRefProperties(QHash<QString, XRefProperties> hash) {
+#if QT_VERSION >= 0x040800
+	m_default_xref_properties.swap(hash);
+#else
 	m_default_xref_properties = hash;
+#endif
 	emit XRefPropertiesChanged();
 }
 


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/