From a9afeadad529309da3dfb0c32700c17c51870296 Mon Sep 17 00:00:00 2001
From: xavier
 <xavier@r991  xavier  2010-05-09 20:40:08 +0200 (dim. 09 mai 2010)>
Date: Mon, 31 Aug 2009 21:26:08 +0000
Subject: [PATCH] Correction du bug #26 : QET compile de nouveau avec Qt 4.4

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@745 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 sources/editor/parttext.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/sources/editor/parttext.cpp b/sources/editor/parttext.cpp
index dadd9c00d..1aa80c677 100644
--- a/sources/editor/parttext.cpp
+++ b/sources/editor/parttext.cpp
@@ -31,7 +31,9 @@ PartText::PartText(QETElementEditor *editor, QGraphicsItem *parent, ElementScene
 	QGraphicsTextItem(parent, scene),
 	CustomElementPart(editor)
 {
+#if QT_VERSION >= 0x040500
 	document() -> setDocumentMargin(1.0);
+#endif
 	setDefaultTextColor(Qt::black);
 	setFont(QETApp::diagramTextsFont());
 	setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
@@ -116,11 +118,20 @@ void PartText::setPos(qreal x, qreal y) {
 QPointF PartText::margin() const {
 	QFont used_font = font();
 	QFontMetrics qfm(used_font);
+	
+	// marge du texte
+#if QT_VERSION >= 0x040500
+	qreal document_margin = document() -> documentMargin();
+#else
+	// il semblerait qu'avant Qt 4.5, ceci vaille non pas 4.0 mais 2.0
+	qreal document_margin = 2.0;
+#endif
+	
 	QPointF margin(
 		// marge autour du texte
-		document() -> documentMargin(),
+		document_margin,
 		// marge au-dessus du texte + distance entre le plafond du texte et la baseline
-		document() -> documentMargin() + qfm.ascent()
+		document_margin + qfm.ascent()
 	);
 	return(margin);
 }